diff options
| author | Gennadiy Chernyshyk | 2018-07-22 19:36:08 +0300 |
|---|---|---|
| committer | Gennadiy Chernyshyk | 2018-07-22 19:51:32 +0300 |
| commit | 751d49501b6fc6744500a71927369fef2197fc65 (patch) | |
| tree | cf72372e5392196765c57169e30c00ea20abc676 | |
| parent | 4769dd8bf8051a9bc219d026b159d8530742b1c0 (diff) | |
| download | aur-751d49501b6fc6744500a71927369fef2197fc65.tar.gz | |
Update to 3.17
48 files changed, 76 insertions, 1983 deletions
@@ -1,8 +1,6 @@ -# Generated by mksrcinfo v8 -# Fri Dec 22 10:41:05 UTC 2017 pkgbase = cocos2d-x-src pkgdesc = Cocos2D-X is a game engine that supports multiple platforms such as iOS, Android, WinXP/7/8, WP8, BlackBerry, MeeGo, Marmelade, WebOS, Mac OS X - pkgver = 3.16 + pkgver = 3.17 pkgrel = 1 url = http://cdn.cocos2d-x.org/ arch = i686 @@ -22,104 +20,12 @@ pkgbase = cocos2d-x-src options = !buildflags options = !strip options = staticlibs - source = http://cdn.cocos2d-x.org/cocos2d-x-3.16.zip - source = README + source = http://cdn.cocos2d-x.org/cocos2d-x-3.17.zip source = cocos2d-x.sh source = cocos2d-x.csh - source = ccShader_PositionTexture.frag.patch - source = ccShader_3D_ColorTex.frag.patch - source = ccShader_PositionTextureColor_noMVP.vert.patch - source = ccShader_3D_ColorNormalTex.frag.patch - source = ccShader_Label.vert.patch - source = ccShader_PositionTextureColorAlphaTest.frag.patch - source = ccShader_PositionTexture_uColor.vert.patch - source = ccShader_PositionTextureA8Color.vert.patch - source = CCGLViewImpl-desktop.cpp.patch - source = ccShader_3D_Color.frag.patch - source = ccShader_3D_PositionNormalTex.vert.patch - source = CMakeLists.patch - source = ccShader_ETC1AS_PositionTextureGray.frag.patch - source = ccShader_ETC1AS_PositionTextureColor.frag.patch - source = ccShader_Position_uColor.vert.patch - source = ccShader_3D_Skybox.vert.patch - source = ccShader_PositionColor.frag.patch - source = ccShader_Label_normal.frag.patch - source = ccShader_3D_Particle.frag.patch - source = ccShader_3D_PositionTex.vert.patch - source = ccShader_PositionTextureA8Color.frag.patch - source = ccShader_Label_outline.frag.patch - source = ccShader_CameraClear.frag.patch - source = CMakeLists.txt.patch - source = ccShader_CameraClear.vert.patch - source = ccShader_PositionTexture.vert.patch - source = Cocos2dxActivity.java.patch - source = ccShader_PositionColorLengthTexture.vert.patch - source = ccShader_3D_Skybox.frag.patch - source = ccShader_Label_df.frag.patch - source = ccShader_UI_Gray.frag.patch - source = ccShader_3D_Terrain.frag.patch - source = ccShader_3D_Terrain.vert.patch - source = ccShader_Position_uColor.frag.patch - source = ccShader_PositionColorTextureAsPointsize.vert.patch - source = ccShader_PositionTextureColor_noMVP.frag.patch - source = CCPhysicsBody.patch - source = ccShader_3D_ColorNormal.frag.patch - source = ccShader_Label_df_glow.frag.patch - source = ccShader_PositionColor.vert.patch - source = ccShader_PositionTextureColor.vert.patch - source = ccShader_PositionTexture_uColor.frag.patch - source = ccShader_PositionColorLengthTexture.frag.patch - source = ccShader_3D_Particle.vert.patch - source = ccShader_PositionTextureColor.frag.patch - sha256sums = 36a2d5e9aab9ba3a7e4229546f3ead8ff4d47b693de4577bdf7db245d09180d6 - sha256sums = 09248ad9af9a94579b56c7c7dbf1b4276a59852c90423ad70c48b16355f28574 + sha256sums = 3cb45f629dda174ab47d083f6818827f58bea194d65c753d60dceed2cbbcedd0 sha256sums = f2f74a36538c43045894bd2b2415a2396bcb5c28f9241296b0e6d39a452b56b1 sha256sums = 3a7ae492fe9b2d7db8ef15c2d47e147746823942943e099d5a494c7076b2e92b - sha256sums = 07d8dbc9dd529b04341bdd4dc047eafb6674f2413d54baa6450f9b7dce78ae53 - sha256sums = 0efc1d771e2b6a5bbca414732317e709c82a53878a0431c64aa2279b9f4321fe - sha256sums = 120250a97af3be476df8dcac1472538c8a11d1ae9ab0624ddae8261b539695a8 - sha256sums = 13de90070e6242d299232778f8a9d41c22c92d518e3a38e32501577826f52149 - sha256sums = 2a7e2557b1d7d85405b1a8337a876d2633921dccdfef8d5a34fb13f923b0ffd2 - sha256sums = 308fa40e69de2c5cfa79e65edc326323bd80e26eb9da539d84ffeddf4e913017 - sha256sums = 35d5761e0005d8a583692a9c44517d956c9ae41da9c1cc69e05ce42d425e26fa - sha256sums = 39bb1106c7df3a2958589b5ae5cdbbf9afd1b381951791761372424c28e4dd4e - sha256sums = 3cc0e9666eeed8c0b4f7a8d0edfe1e5245c1cca53ca7e4a150660dc1bbf2a299 - sha256sums = 3f697c60080e85940a623a358a6d13ccab8a8f87346521c210196cc8ee48dcac - sha256sums = 3fb4eb3b15dd0f28e8d171719c779d9680329126ae6cc56ce10d0d3784b0aa15 - sha256sums = 4616ec6d01530d168d5f9369bff764cbd33e944d8d0f66ff3ecffbc2d7423292 - sha256sums = 485ea7adc13632762aa78758c96287cc41f85a2d3edf2ab9e7b299883db52c9b - sha256sums = 4b588741894aec0b2da47a35ff39787458202a431b88f0af6e422fcb4ee34709 - sha256sums = 5394b03f78a25d6736171c792b384b6abdb20e80647cbf5220c55729eb9a2650 - sha256sums = 572d86d285fa1bb6b72aa6d012244adfe3f3a304b66764fd555997dc8462baf4 - sha256sums = 5a7b57272514d4204fea0944151ab9eb23d533b1a97c289e408269eb2d877728 - sha256sums = 62db6b5d01b14d8f4322a8e32cd7257ca8b87b6d55aa9a18418bc90d85ccfc89 - sha256sums = 70351ae2d5a53fd42c96d5702efcef48d15a71ed7c4e55911c9678cfca7c4ab6 - sha256sums = 79b79366bc2690a01128fbfd0742f58ccf8f9f2ca1d7dd0a4b73d47c096ee7f6 - sha256sums = 7b33a4d78fa89b8b6a8fe3317dbf2e93e72f4579b9bedcefa1d4ac5daa5e4872 - sha256sums = 8437d3cf0d8ae3af545917095cf236b93fa0c2c480062cfefd786bfa2db5c209 - sha256sums = 898e63f7352513848213e8fa929364acbd85707c9bbf054250c253499b65b4b7 - sha256sums = 9a5a73ed7a1fc0cc152b0d27878b973abd525dd1a5906757d6dd385178f69835 - sha256sums = 9b7f760d99844b456a2f56e2a875e5355a7766537b4d2b33970d5d66bb397e3e - sha256sums = afe36a4cd2347c33c6c610b15966c1c4072d813a1b8a7ddcf611f3b8c0d08836 - sha256sums = b2575e466cbba3d1abf3f467b0ea4505a00c3645de5ee8f8908b693d708b3c67 - sha256sums = b2e422006a7f5348f3833d28b17a44ab1c4afd9daaeed65d4505bbedf0647eff - sha256sums = b8292b1c7971c285a7732e39b492f919df985c35a982a30bd9f004e9cd07f2fb - sha256sums = bdd4bb3218853c9f0a7675d3d98a50e5e1d6b69b1b3861255bf0f497782d8954 - sha256sums = c4cb76c3d896e66391453173f30417f8646257c1d702ee5a3cb3e4980f3df000 - sha256sums = c56d1402ddfa5a7c5607a23b44768880797f84bc1081cbf773fa457be5b2be0a - sha256sums = c7101ce86d01afa4c20efb4f89dd3e2b6d85059df233e57539648922c3eaca8f - sha256sums = db37cb1c64fc1990e26da2cc1d7a7756d50c2059a24c5d0d29757275850ace4d - sha256sums = dcb815b3c7a8e431fb8678701785d8cfb6568dc0976b86ab43c824fce765338c - sha256sums = de468779316ec6438fde600328aa648c7904db0dc3c918535efd59e67d410013 - sha256sums = e0a639cb2f2aa2b918e8a320e4faf6fb30878d2db0235e4e999a0836a23d684f - sha256sums = e8418d25047914058adbddce65b5f9ca7abd88bf45a1e063d8eb69aa997d4a9c - sha256sums = e847773c38ef54d23b6f3fefbf9b717ca187a2780cd2b3d020f0eeb3b4a94971 - sha256sums = e962c317447119b2730103ddb9cddad5f366c614cab05249a5b52a92d14d0147 - sha256sums = eb2bee833918146282c2e9df02b3b021c5e95f0014d3eaa7df8da20ba3df7403 - sha256sums = ed7882c39f4074cc71d3498a4825b0e20ee895bc926419fda30ad8de1a2eaa43 - sha256sums = ef4fd5d339ed872d41848847596a49a79f6a5d26c46a7edce8aadf2a9764e53a - sha256sums = f956e3b937c663a159a6c7bc92d5c951fd18836113dcc125bb0fe46147e62531 - sha256sums = ffd5fb98cc4f6edfdda8a2e807ce97351fca6bf2dfd9570e158da797fc6b1245 pkgname = cocos2d-x-src diff --git a/CCGLViewImpl-desktop.cpp.patch b/CCGLViewImpl-desktop.cpp.patch deleted file mode 100644 index 45ad7d12b0fd..000000000000 --- a/CCGLViewImpl-desktop.cpp.patch +++ /dev/null @@ -1,11 +0,0 @@ -@@ -373,6 +373,11 @@ bool GLViewImpl::initWithRect(const std::string& viewName, Rect rect, float fram - glfwWindowHint(GLFW_DEPTH_BITS,_glContextAttrs.depthBits); - glfwWindowHint(GLFW_STENCIL_BITS,_glContextAttrs.stencilBits); - -+ // Disable Mutli-sample Anti-aliasing (MSAA). -+ // This will make the code run faster on slower devices -+ // See: http://discuss.cocos2d-x.org/t/labels-and-anti-aliasing-in-3-2/17846/5 -+ glfwWindowHint(GLFW_SAMPLES, 0); -+ - int neededWidth = rect.size.width * _frameZoomFactor; - int neededHeight = rect.size.height * _frameZoomFactor; diff --git a/CCPhysicsBody.patch b/CCPhysicsBody.patch deleted file mode 100644 index d3451769be7b..000000000000 --- a/CCPhysicsBody.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- lel/cocos2d-x-3.14/cocos/physics/CCPhysicsBody.cpp 2016-12-29 13:42:38.000000000 -0400 -+++ /opt/cocos2d-x-git/cocos/physics/CCPhysicsBody.cpp 2017-01-08 12:02:19.747686186 -0400 -@@ -575,12 +575,12 @@ - - void PhysicsBody::setVelocity(const Vec2& velocity) - { -- if (!_dynamic) -+ if (cpBodyGetType(_cpBody) == CP_BODY_TYPE_STATIC) - { -- CCLOG("physics warning: your can't set velocity for a static body."); -+ CCLOG("physics warning: you can't set velocity for a static body."); - return; - } -- -+ - cpBodySetVelocity(_cpBody, PhysicsHelper::point2cpv(velocity)); - } - -@@ -601,12 +601,12 @@ - - void PhysicsBody::setAngularVelocity(float velocity) - { -- if (!_dynamic) -+ if (cpBodyGetType(_cpBody) == CP_BODY_TYPE_STATIC) - { -- CCLOG("physics warning: your can't set angular velocity for a static body."); -+ CCLOG("physics warning: you can't set angular velocity for a static body."); - return; - } -- -+ - cpBodySetAngularVelocity(_cpBody, velocity); - } - diff --git a/CMakeLists.patch b/CMakeLists.patch deleted file mode 100644 index 81483a148496..000000000000 --- a/CMakeLists.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- CMakeLists.txt 2016-12-29 13:42:40.000000000 -0400 -+++ /opt/cocos2d-x-git/templates/cpp-template-default/CMakeLists.txt 2017-01-02 14:48:01.678168302 -0400 -@@ -34,12 +34,6 @@ - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${COCOS2D_ROOT}/cmake/Modules/") - include(CocosBuildHelpers) - --# libcocos2d --set(BUILD_CPP_EMPTY_TEST OFF CACHE BOOL "turn off build cpp-empty-test") --set(BUILD_CPP_TESTS OFF CACHE BOOL "turn off build cpp-tests") --set(BUILD_LUA_LIBS OFF CACHE BOOL "turn off build lua related targets") --set(BUILD_JS_LIBS OFF CACHE BOOL "turn off build js related targets") --add_subdirectory(${COCOS2D_ROOT}) - - # Some macro definitions - if(WINDOWS) -@@ -69,15 +63,18 @@ - # Compiler options - if(MSVC) - if(CMAKE_BUILD_TYPE STREQUAL "Debug") -- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:msvcrt /NODEFAULTLIB:libcmt") -+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:msvcrt /NODEFAULTLIB:libcmt") - else() -- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:libcmt") -+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:libcmt") - endif() - ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS - -wd4251 -wd4244 -wd4334 -wd4005 -wd4820 -wd4710 - -wd4514 -wd4056 -wd4996 -wd4099) - else() -- set(CMAKE_C_FLAGS_DEBUG "-g -Wall -DCOCOS2D_DEBUG=1") -+ if(CMAKE_BUILD_TYPE MATCHES Debug) -+ ADD_DEFINITIONS(-DCOCOS2D_DEBUG=1) -+ endif() -+ set(CMAKE_C_FLAGS_DEBUG "-g -Wall") - set(CMAKE_CXX_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG}) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-deprecated-declarations -Wno-reorder") -@@ -86,7 +83,6 @@ - endif() - endif(MSVC) - -- - set(PLATFORM_SPECIFIC_SRC) - set(PLATFORM_SPECIFIC_HEADERS) - -@@ -139,6 +135,16 @@ - ${PLATFORM_SPECIFIC_HEADERS} - ) - -+ -+# Configure libcocos2d -+set(BUILD_CPP_EMPTY_TEST OFF CACHE BOOL "turn off build cpp-empty-test") -+set(BUILD_CPP_TESTS OFF CACHE BOOL "turn off build cpp-tests") -+set(BUILD_LUA_LIBS OFF CACHE BOOL "turn off build lua related targets") -+set(BUILD_JS_LIBS OFF CACHE BOOL "turn off build js related targets") -+add_subdirectory(${COCOS2D_ROOT}) -+ -+ -+# MyGame - if( ANDROID ) - add_library(${APP_NAME} SHARED ${GAME_SRC} ${GAME_HEADERS}) - IF(CMAKE_BUILD_TYPE MATCHES RELEASE) diff --git a/CMakeLists.txt.patch b/CMakeLists.txt.patch deleted file mode 100644 index 9b6dc640f8b4..000000000000 --- a/CMakeLists.txt.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- /opt/cocos2d-x/templates/cpp-template-default/CMakeLists.txt 2017-04-12 15:00:32.000000000 -0400 -+++ CMakeLists.txt 2017-04-21 06:56:01.553541916 -0400 -@@ -138,7 +138,22 @@ - ) - - --# Configure libcocos2d -+# Configure libcocos2d: -+# Uncomment to disable/enable compilation and linking of the following features: -+#set(USE_CHIPMUNK OFF CACHE BOOL "Use chipmunk for physics library") -+#set(USE_BOX2D ON CACHE BOOL "Use box2d for physics library") -+#set(USE_BULLET OFF CACHE BOOL "Use bullet for physics3d library") -+#set(USE_RECAST OFF CACHE BOOL "Use Recast for navigation mesh") -+#set(USE_WEBP OFF CACHE BOOL "Use WebP codec") -+#set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libraries") -+#set(DEBUG_MODE OFF CACHE BOOL "Debug or release?") -+#set(BUILD_EXTENSIONS OFF CACHE BOOL "Build extension library") -+#set(BUILD_EDITOR_SPINE OFF CACHE BOOL "Build editor support for spine") -+#set(BUILD_EDITOR_COCOSTUDIO OFF CACHE BOOL "Build editor support for cocostudio") -+#set(BUILD_EDITOR_COCOSBUILDER OFF CACHE BOOL "Build editor support for cocosbuilder") -+#set(BUILD_BOX2D OFF CACHE BOOL "Build box2d external without using it for physics library") -+#set(USE_PREBUILT_LIBS OFF CACHE BOOL "Use prebuilt libraries in external directory") # Note: there's no support for this in Linux -+#set(USE_SOURCES_EXTERNAL OFF CACHE BOOL "Use sources in external directory (automatically ON when USE_PREBUILT_LIBS is)") # Note: there's no support for this in Linux - set(BUILD_CPP_EMPTY_TEST OFF CACHE BOOL "turn off build cpp-empty-test") - set(BUILD_CPP_TESTS OFF CACHE BOOL "turn off build cpp-tests") - set(BUILD_LUA_LIBS OFF CACHE BOOL "turn off build lua related targets") diff --git a/Cocos2dxActivity.java.patch b/Cocos2dxActivity.java.patch deleted file mode 100644 index 856d54ed1d4b..000000000000 --- a/Cocos2dxActivity.java.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- /opt/cocos2d-x/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxActivity.java 2017-04-18 14:00:04.000000000 -0400 -+++ Cocos2dxActivity.java 2017-04-21 07:00:14.941774219 -0400 -@@ -172,6 +172,8 @@ - EGL10.EGL_ALPHA_SIZE, configAttribs[3], - EGL10.EGL_DEPTH_SIZE, configAttribs[4], - EGL10.EGL_STENCIL_SIZE,configAttribs[5], -+ EGL10.EGL_SAMPLE_BUFFERS,1, -+ EGL10.EGL_SAMPLES,0, - EGL10.EGL_RENDERABLE_TYPE, 4, //EGL_OPENGL_ES2_BIT - EGL10.EGL_NONE - }; @@ -1,251 +1,96 @@ -# Mantainer: Wilson E. Alvarez <wilson.e.alvarez1@gmail.com> +# Mantainer: Gennadiy Chernyshyk <genaloner@gmail.com> +# Previous Mantainer: Wilson E. Alvarez <wilson.e.alvarez1@gmail.com> # Previous Maintainer: Samuel FORGIONE <samuel.forgione@gmail.com> +# After installation, you need to reload the environment variables from /etc/profile. You can do it manually: +# `source /etc/profile` +# or just reload session. +# +# In order to use android, you should define in your bashrc, zshrc, whateverrc : +# export NDK_ROOT=/opt/android-ndk +# export ANDROID_SDK_ROOT=/opt/android-sdk +# export ANT_ROOT=/usr/bin +# (Each path came with package aur/android-ndk aur/android-sdk and extra/apache-ant) +# +# Use `cocos` wrapper to create, compile and run your project. +# `cocos` will echo you basic command +# `cocos <command>` will echo you basic parameter for <command> +# +# Basic setup: +# `cocos new -l cpp -p com.firm.app myapp` +# `cd myapp` +# `cocos run -p android -j$(nproc)` +# `cocos run -p linux -j$(nproc)` +# Or you do it manually: +# `cocos new -l cpp -p com.firm.app myapp` +# `mkdir linux-build && cd linux-build` +# `cmake ..` +# `../bin/debug/linux/MyGame` + _appname=cocos2d-x pkgname=cocos2d-x-src -pkgver=3.16 +pkgver=3.17 pkgrel=1 pkgdesc="Cocos2D-X is a game engine that supports multiple platforms such as iOS, Android, WinXP/7/8, WP8, BlackBerry, MeeGo, Marmelade, WebOS, Mac OS X" arch=('i686' 'x86_64') url="http://cdn.cocos2d-x.org/" license=('MIT License') depends=('glew' 'glfw' 'glibc' 'fontconfig' 'libgl' 'curl' 'libx11' 'zlib' 'libpng' 'freetype2' 'python2') -#depends=('openssl' 'sqlite3') options=('!buildflags' '!strip' 'staticlibs') -source=( -"${url}${_appname}-${pkgver}.zip" -"README" -"$_appname.sh" -"$_appname.csh" -'ccShader_PositionTexture.frag.patch' -'ccShader_3D_ColorTex.frag.patch' -'ccShader_PositionTextureColor_noMVP.vert.patch' -'ccShader_3D_ColorNormalTex.frag.patch' -'ccShader_Label.vert.patch' -'ccShader_PositionTextureColorAlphaTest.frag.patch' -'ccShader_PositionTexture_uColor.vert.patch' -'ccShader_PositionTextureA8Color.vert.patch' -'CCGLViewImpl-desktop.cpp.patch' -'ccShader_3D_Color.frag.patch' -'ccShader_3D_PositionNormalTex.vert.patch' -'CMakeLists.patch' -'ccShader_ETC1AS_PositionTextureGray.frag.patch' -'ccShader_ETC1AS_PositionTextureColor.frag.patch' -'ccShader_Position_uColor.vert.patch' -'ccShader_3D_Skybox.vert.patch' -'ccShader_PositionColor.frag.patch' -'ccShader_Label_normal.frag.patch' -'ccShader_3D_Particle.frag.patch' -'ccShader_3D_PositionTex.vert.patch' -'ccShader_PositionTextureA8Color.frag.patch' -'ccShader_Label_outline.frag.patch' -'ccShader_CameraClear.frag.patch' -'CMakeLists.txt.patch' -'ccShader_CameraClear.vert.patch' -'ccShader_PositionTexture.vert.patch' -'Cocos2dxActivity.java.patch' -'ccShader_PositionColorLengthTexture.vert.patch' -'ccShader_3D_Skybox.frag.patch' -'ccShader_Label_df.frag.patch' -'ccShader_UI_Gray.frag.patch' -'ccShader_3D_Terrain.frag.patch' -'ccShader_3D_Terrain.vert.patch' -'ccShader_Position_uColor.frag.patch' -'ccShader_PositionColorTextureAsPointsize.vert.patch' -'ccShader_PositionTextureColor_noMVP.frag.patch' -'CCPhysicsBody.patch' -'ccShader_3D_ColorNormal.frag.patch' -'ccShader_Label_df_glow.frag.patch' -'ccShader_PositionColor.vert.patch' -'ccShader_PositionTextureColor.vert.patch' -'ccShader_PositionTexture_uColor.frag.patch' -'ccShader_PositionColorLengthTexture.frag.patch' -'ccShader_3D_Particle.vert.patch' -'ccShader_PositionTextureColor.frag.patch' -) -sha256sums=( -'36a2d5e9aab9ba3a7e4229546f3ead8ff4d47b693de4577bdf7db245d09180d6' -'09248ad9af9a94579b56c7c7dbf1b4276a59852c90423ad70c48b16355f28574' -'f2f74a36538c43045894bd2b2415a2396bcb5c28f9241296b0e6d39a452b56b1' -'3a7ae492fe9b2d7db8ef15c2d47e147746823942943e099d5a494c7076b2e92b' -'07d8dbc9dd529b04341bdd4dc047eafb6674f2413d54baa6450f9b7dce78ae53' -'0efc1d771e2b6a5bbca414732317e709c82a53878a0431c64aa2279b9f4321fe' -'120250a97af3be476df8dcac1472538c8a11d1ae9ab0624ddae8261b539695a8' -'13de90070e6242d299232778f8a9d41c22c92d518e3a38e32501577826f52149' -'2a7e2557b1d7d85405b1a8337a876d2633921dccdfef8d5a34fb13f923b0ffd2' -'308fa40e69de2c5cfa79e65edc326323bd80e26eb9da539d84ffeddf4e913017' -'35d5761e0005d8a583692a9c44517d956c9ae41da9c1cc69e05ce42d425e26fa' -'39bb1106c7df3a2958589b5ae5cdbbf9afd1b381951791761372424c28e4dd4e' -'3cc0e9666eeed8c0b4f7a8d0edfe1e5245c1cca53ca7e4a150660dc1bbf2a299' -'3f697c60080e85940a623a358a6d13ccab8a8f87346521c210196cc8ee48dcac' -'3fb4eb3b15dd0f28e8d171719c779d9680329126ae6cc56ce10d0d3784b0aa15' -'4616ec6d01530d168d5f9369bff764cbd33e944d8d0f66ff3ecffbc2d7423292' -'485ea7adc13632762aa78758c96287cc41f85a2d3edf2ab9e7b299883db52c9b' -'4b588741894aec0b2da47a35ff39787458202a431b88f0af6e422fcb4ee34709' -'5394b03f78a25d6736171c792b384b6abdb20e80647cbf5220c55729eb9a2650' -'572d86d285fa1bb6b72aa6d012244adfe3f3a304b66764fd555997dc8462baf4' -'5a7b57272514d4204fea0944151ab9eb23d533b1a97c289e408269eb2d877728' -'62db6b5d01b14d8f4322a8e32cd7257ca8b87b6d55aa9a18418bc90d85ccfc89' -'70351ae2d5a53fd42c96d5702efcef48d15a71ed7c4e55911c9678cfca7c4ab6' -'79b79366bc2690a01128fbfd0742f58ccf8f9f2ca1d7dd0a4b73d47c096ee7f6' -'7b33a4d78fa89b8b6a8fe3317dbf2e93e72f4579b9bedcefa1d4ac5daa5e4872' -'8437d3cf0d8ae3af545917095cf236b93fa0c2c480062cfefd786bfa2db5c209' -'898e63f7352513848213e8fa929364acbd85707c9bbf054250c253499b65b4b7' -'9a5a73ed7a1fc0cc152b0d27878b973abd525dd1a5906757d6dd385178f69835' -'9b7f760d99844b456a2f56e2a875e5355a7766537b4d2b33970d5d66bb397e3e' -'afe36a4cd2347c33c6c610b15966c1c4072d813a1b8a7ddcf611f3b8c0d08836' -'b2575e466cbba3d1abf3f467b0ea4505a00c3645de5ee8f8908b693d708b3c67' -'b2e422006a7f5348f3833d28b17a44ab1c4afd9daaeed65d4505bbedf0647eff' -'b8292b1c7971c285a7732e39b492f919df985c35a982a30bd9f004e9cd07f2fb' -'bdd4bb3218853c9f0a7675d3d98a50e5e1d6b69b1b3861255bf0f497782d8954' -'c4cb76c3d896e66391453173f30417f8646257c1d702ee5a3cb3e4980f3df000' -'c56d1402ddfa5a7c5607a23b44768880797f84bc1081cbf773fa457be5b2be0a' -'c7101ce86d01afa4c20efb4f89dd3e2b6d85059df233e57539648922c3eaca8f' -'db37cb1c64fc1990e26da2cc1d7a7756d50c2059a24c5d0d29757275850ace4d' -'dcb815b3c7a8e431fb8678701785d8cfb6568dc0976b86ab43c824fce765338c' -'de468779316ec6438fde600328aa648c7904db0dc3c918535efd59e67d410013' -'e0a639cb2f2aa2b918e8a320e4faf6fb30878d2db0235e4e999a0836a23d684f' -'e8418d25047914058adbddce65b5f9ca7abd88bf45a1e063d8eb69aa997d4a9c' -'e847773c38ef54d23b6f3fefbf9b717ca187a2780cd2b3d020f0eeb3b4a94971' -'e962c317447119b2730103ddb9cddad5f366c614cab05249a5b52a92d14d0147' -'eb2bee833918146282c2e9df02b3b021c5e95f0014d3eaa7df8da20ba3df7403' -'ed7882c39f4074cc71d3498a4825b0e20ee895bc926419fda30ad8de1a2eaa43' -'ef4fd5d339ed872d41848847596a49a79f6a5d26c46a7edce8aadf2a9764e53a' -'f956e3b937c663a159a6c7bc92d5c951fd18836113dcc125bb0fe46147e62531' -'ffd5fb98cc4f6edfdda8a2e807ce97351fca6bf2dfd9570e158da797fc6b1245' -) +source=("${url}${_appname}-${pkgver}.zip" + "${_appname}.sh" + "${_appname}.csh") +sha256sums=('3cb45f629dda174ab47d083f6818827f58bea194d65c753d60dceed2cbbcedd0' + 'f2f74a36538c43045894bd2b2415a2396bcb5c28f9241296b0e6d39a452b56b1' + '3a7ae492fe9b2d7db8ef15c2d47e147746823942943e099d5a494c7076b2e92b') prepare() { - cd "$srcdir"/$_appname-$pkgver + cd "$srcdir/${_appname}-$pkgver" + + # Remove junk files + find -name "*README*" -exec rm {} + + find -name "*AUTHORS*" -exec rm {} + + rm .travis.yml + rm .appveyor.yml + rm CONTRIBUTING.md + rm download-deps.py + rm issue_template.md + rm setup.py + rm CHANGELOG + rm web/.gitignore + rm web/CHANGELOG.txt + rm 'web/tools/readme for tools.txt' + rm tools/missing-tools.txt + rm -r licenses + + # Update the file timestamps -- otherwise the build system will keep recompiling everything always: + find -exec touch {} + - # Note: Disabled downloading external dependencies since they are included - # with Cocos2D-X. On some releases this might be needed: - #chmod +x "download-deps.py" - #python2 "download-deps.py" -r yes + # Fix permissions: + chmod 755 tools/cocos2d-console/bin/cocos + chmod 755 tools/cocos2d-console/plugins/plugin_package/sdkbox + + # Set sdkbox python interpreter to python2 + sed -e 's/python/python2/g' -i tools/cocos2d-console/plugins/plugin_package/sdkbox + + # Disable sending usage data + sed -e 's/enable_stat=.*/enable_stat=false/g' -i tools/cocos2d-console/bin/cocos2d.ini + + # Add necessary libfmod symbolic link + cd external/linux-specific/fmod/prebuilt/64-bit + ln -sf libfmod.so libfmod.so.6 + ln -sf libfmodL.so libfmodL.so.6 } package() { # Install preliminary files - install -d "$pkgdir/opt/$_appname" - install -Dm644 "README" "$pkgdir/opt/$_appname/README" - install -Dm755 "$_appname.sh" "$pkgdir/etc/profile.d/$_appname.sh" - install -Dm755 "$_appname.csh" "$pkgdir/etc/profile.d/$_appname.csh" - - ## ===============PATCHES BEGIN======================= - - ## Performance tweaks - - ## TODO: add CMake configuration flags to ease the configuratino of libcocos2d: - #patch -s "$srcdir"/$_appname-$pkgver/templates/cpp-template-default/CMakeLists.txt CMakeLists.txt.patch - - # Patch ProcessCpuTracker.cpp to fix NDK v15 issue: - #patch -s "$srcdir"/$_appname-$pkgver/cocos/platform/android/jni/ProcessCpuTracker.cpp ProcessCpuTracker.cpp.patch - - # Switch C++ multiline string literal to the STRINGIFY macro which uses less memory. See https://github.com/cocos2d/cocos2d-x/pull/16742 - # TL;DR: For smoother development, using the C++ multiline string literal is convenient, however the STRINGIFY macro defined at ccShaders.cpp uses less memory. - patch -s "$srcdir"/$_appname-$pkgver/cocos/renderer/ccShader_3D_Color.frag ccShader_3D_Color.frag.patch - patch -s "$srcdir"/$_appname-$pkgver/cocos/renderer/ccShader_3D_ColorNormal.frag ccShader_3D_ColorNormal.frag.patch - patch -s "$srcdir"/$_appname-$pkgver/cocos/renderer/ccShader_3D_ColorNormalTex.frag ccShader_3D_ColorNormalTex.frag.patch - patch -s "$srcdir"/$_appname-$pkgver/cocos/renderer/ccShader_3D_ColorTex.frag ccShader_3D_ColorTex.frag.patch - patch -s "$srcdir"/$_appname-$pkgver/cocos/renderer/ccShader_3D_Particle.frag ccShader_3D_Particle.frag.patch - patch -s "$srcdir"/$_appname-$pkgver/cocos/renderer/ccShader_3D_Particle.vert ccShader_3D_Particle.vert.patch - patch -s "$srcdir"/$_appname-$pkgver/cocos/renderer/ccShader_3D_PositionNormalTex.vert ccShader_3D_PositionNormalTex.vert.patch - patch -s "$srcdir"/$_appname-$pkgver/cocos/renderer/ccShader_3D_PositionTex.vert ccShader_3D_PositionTex.vert.patch - patch -s "$srcdir"/$_appname-$pkgver/cocos/renderer/ccShader_3D_Skybox.frag ccShader_3D_Skybox.frag.patch - patch -s "$srcdir"/$_appname-$pkgver/cocos/renderer/ccShader_3D_Skybox.vert ccShader_3D_Skybox.vert.patch - patch -s "$srcdir"/$_appname-$pkgver/cocos/renderer/ccShader_3D_Terrain.frag ccShader_3D_Terrain.frag.patch - patch -s "$srcdir"/$_appname-$pkgver/cocos/renderer/ccShader_3D_Terrain.vert ccShader_3D_Terrain.vert.patch - patch -s "$srcdir"/$_appname-$pkgver/cocos/renderer/ccShader_CameraClear.frag ccShader_CameraClear.frag.patch - patch -s "$srcdir"/$_appname-$pkgver/cocos/renderer/ccShader_CameraClear.vert ccShader_CameraClear.vert.patch - patch -s "$srcdir"/$_appname-$pkgver/cocos/renderer/ccShader_ETC1AS_PositionTextureColor.frag ccShader_ETC1AS_PositionTextureColor.frag.patch - patch -s "$srcdir"/$_appname-$pkgver/cocos/renderer/ccShader_ETC1AS_PositionTextureGray.frag ccShader_ETC1AS_PositionTextureGray.frag.patch - patch -s "$srcdir"/$_appname-$pkgver/cocos/renderer/ccShader_Label.vert ccShader_Label.vert.patch - patch -s "$srcdir"/$_appname-$pkgver/cocos/renderer/ccShader_Label_df.frag ccShader_Label_df.frag.patch - patch -s "$srcdir"/$_appname-$pkgver/cocos/renderer/ccShader_Label_df_glow.frag ccShader_Label_df_glow.frag.patch - patch -s "$srcdir"/$_appname-$pkgver/cocos/renderer/ccShader_Label_normal.frag ccShader_Label_normal.frag.patch - patch -s "$srcdir"/$_appname-$pkgver/cocos/renderer/ccShader_Label_outline.frag ccShader_Label_outline.frag.patch - patch -s "$srcdir"/$_appname-$pkgver/cocos/renderer/ccShader_PositionColor.frag ccShader_PositionColor.frag.patch - patch -s "$srcdir"/$_appname-$pkgver/cocos/renderer/ccShader_PositionColor.vert ccShader_PositionColor.vert.patch - patch -s "$srcdir"/$_appname-$pkgver/cocos/renderer/ccShader_PositionColorLengthTexture.frag ccShader_PositionColorLengthTexture.frag.patch - patch -s "$srcdir"/$_appname-$pkgver/cocos/renderer/ccShader_PositionColorLengthTexture.vert ccShader_PositionColorLengthTexture.vert.patch - patch -s "$srcdir"/$_appname-$pkgver/cocos/renderer/ccShader_PositionColorTextureAsPointsize.vert ccShader_PositionColorTextureAsPointsize.vert.patch - patch -s "$srcdir"/$_appname-$pkgver/cocos/renderer/ccShader_PositionTexture.frag ccShader_PositionTexture.frag.patch - patch -s "$srcdir"/$_appname-$pkgver/cocos/renderer/ccShader_PositionTexture.vert ccShader_PositionTexture.vert.patch - patch -s "$srcdir"/$_appname-$pkgver/cocos/renderer/ccShader_PositionTextureA8Color.frag ccShader_PositionTextureA8Color.frag.patch - patch -s "$srcdir"/$_appname-$pkgver/cocos/renderer/ccShader_PositionTextureA8Color.vert ccShader_PositionTextureA8Color.vert.patch - patch -s "$srcdir"/$_appname-$pkgver/cocos/renderer/ccShader_PositionTextureColor.frag ccShader_PositionTextureColor.frag.patch - patch -s "$srcdir"/$_appname-$pkgver/cocos/renderer/ccShader_PositionTextureColor.vert ccShader_PositionTextureColor.vert.patch - patch -s "$srcdir"/$_appname-$pkgver/cocos/renderer/ccShader_PositionTextureColorAlphaTest.frag ccShader_PositionTextureColorAlphaTest.frag.patch - patch -s "$srcdir"/$_appname-$pkgver/cocos/renderer/ccShader_PositionTextureColor_noMVP.frag ccShader_PositionTextureColor_noMVP.frag.patch - patch -s "$srcdir"/$_appname-$pkgver/cocos/renderer/ccShader_PositionTextureColor_noMVP.vert ccShader_PositionTextureColor_noMVP.vert.patch - patch -s "$srcdir"/$_appname-$pkgver/cocos/renderer/ccShader_PositionTexture_uColor.frag ccShader_PositionTexture_uColor.frag.patch - patch -s "$srcdir"/$_appname-$pkgver/cocos/renderer/ccShader_PositionTexture_uColor.vert ccShader_PositionTexture_uColor.vert.patch - patch -s "$srcdir"/$_appname-$pkgver/cocos/renderer/ccShader_Position_uColor.frag ccShader_Position_uColor.frag.patch - patch -s "$srcdir"/$_appname-$pkgver/cocos/renderer/ccShader_Position_uColor.vert ccShader_Position_uColor.vert.patch - patch -s "$srcdir"/$_appname-$pkgver/cocos/renderer/ccShader_UI_Gray.frag ccShader_UI_Gray.frag.patch - - # Engine tweaks that must be adjusted on a user basis -- must be enabled by the users. These change the behaviour of the engine in certain areas - - # Disable antialiasing globally for higher performance in general. - # Pixel art looks better with this disabled. - if [[ -n $COCOS2D_X_DISABLE_ANTIALIASING ]]; then - msg "Disabling Antialiasing globally..." - sed -e 's/_antialiasEnabled(true)/_antialiasEnabled(false)/g' -i "$srcdir"/$_appname-$pkgver/cocos/renderer/CCTexture2D.cpp - fi - - # Disabled Multi-Sample Anti-Aliasing (MSAA) for higher performance - if [[ -n $COCOS2D_X_DISABLE_MSAA ]]; then - msg "Disabling MSAA globally..." - # TODO: For Android - # patch -s "$srcdir"/$_appname-$pkgver/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxActivity.java Cocos2dxActivity.java.patch - - # For Linux, Mac and Windows: - patch -s "$srcdir"/$_appname-$pkgver/cocos/platform/desktop/CCGLViewImpl-desktop.cpp CCGLViewImpl-desktop.cpp.patch - - #iOS -- Not really necessary. Cocos2D-X, according to the documentation, requires iOS 7+ which are fairly new devices and disabling MSAA on those devices might not even increase performance. See http://gamesfromwithin.com/trying-out-multisampling-on-ios - # There's some documentation here on working with iOS MSAA: https://developer.apple.com/library/content/documentation/3DDrawing/Conceptual/OpenGLES_ProgrammingGuide/WorkingwithEAGLContexts/WorkingwithEAGLContexts.html#//apple_ref/doc/uid/TP40008793-CH103-SW12 - # I might try implementing a patch for disabling MSAA on if I may need the performance boost. Leaving it on seems like the way to go for now. - fi - - if [[ -n $COCOS2D_X_EXPERIMENTAL_FEATURES ]]; then - warning "Enabling experimental features." - # (EXPERIMENTAL) Enable high variable precision globaly in the shaders: - # This can get rid of positioning and rendering artifacts but might affect performance on devices with a slow GPU. - # See: https://github.com/cocos2d/cocos2d-x/issues/17046 and https://github.com/cocos2d/cocos2d-x/issues/17099 - # Until a proper patch gets developed, a simple 'sed' can set every variable from a medium precision (mediump) one to a high precision (highp) variable - # Use at your own risk - warning "Changing \"mediump\" to \"highp\" in shaders..." - sed -i 's/mediump/highp/g' "$srcdir"/$_appname-$pkgver/cocos/renderer/* - fi - - # Necessary libfmod symbolic link - mkdir -p "$pkgdir/usr/lib" - if [[ $CARCH == "x86_64" ]]; then - mkdir -p "$pkgdir/usr/lib32" - ln -sf /opt/cocos2d-x/external/linux-specific/fmod/prebuilt/64-bit/libfmod.so "$pkgdir/usr/lib/libfmod.so.6" - ln -sf /opt/cocos2d-x/external/linux-specific/fmod/prebuilt/64-bit/libfmodL.so "$pkgdir/usr/lib/libfmodL.so.6" - - # 32-bit linux support was dropped. - #ln -sf /opt/cocos2d-x/external/linux-specific/fmod/prebuilt/32-bit/libfmod.so "$pkgdir/usr/lib32/libfmod.so.6" - #ln -sf /opt/cocos2d-x/external/linux-specific/fmod/prebuilt/32-bit/libfmodL.so "$pkgdir/usr/lib32/libfmodL.so.6" - else - ln -sf /opt/cocos2d-x/external/linux-specific/fmod/prebuilt/32-bit/libfmod.so "$pkgdir/usr/lib/libfmod.so.6" - ln -sf /opt/cocos2d-x/external/linux-specific/fmod/prebuilt/32-bit/libfmodL.so "$pkgdir/usr/lib/libfmodL.so.6" - fi - - # Update the file timestamps -- otherwise the build system will keep recompiling everything always: - find "$srcdir"/$_appname-$pkgver -exec touch {} + - - # Set sdkbox python interpreter to python2 - sed -e 's/python/python2/g' -i "$srcdir"/$_appname-$pkgver/tools/cocos2d-console/plugins/plugin_package/sdkbox - - # Fix permissions: - chmod 755 "$srcdir"/$_appname-$pkgver/tools/cocos2d-console/bin/cocos - chmod 755 "$srcdir"/$_appname-$pkgver/tools/cocos2d-console/plugins/plugin_package/sdkbox + install -d "$pkgdir/opt/${_appname}" + install -Dm755 "${_appname}.sh" "$pkgdir/etc/profile.d/${_appname}.sh" + install -Dm755 "${_appname}.csh" "$pkgdir/etc/profile.d/${_appname}.csh" - # Package source - mv "$srcdir"/$_appname-$pkgver/* "$pkgdir/opt/$_appname" + # Copy package source + mv "$srcdir"/${_appname}-$pkgver/* "$pkgdir/opt/${_appname}" } diff --git a/README b/README deleted file mode 100644 index 1af775b5380d..000000000000 --- a/README +++ /dev/null @@ -1,50 +0,0 @@ -************************ -** CONFIGURATION ** -************************ - * In order to use android, you should define in your bashrc, zshrc, whateverrc : -export NDK_ROOT=/opt/android-ndk -export ANDROID_SDK_ROOT=/opt/android-sdk -export ANT_ROOT=/usr/bin - (Each path came with package aur/android-ndk aur/android-sdk and extra/apache-ant) - - - * Use "cocos" wrapper to create, compile, run your project... - "cocos" will echo you basic command - "cocos command" will echo you basic parameter for "command" - - Basic setup : - cocos new -l cpp -p com.firm.app myapp - cd myapp - cocos run -p android -j3 - cocos run -p linux -j3 - - Alternative 1 : - cocos new -l cpp -p com.firm.app myapp - mkdir linux-build && cd linux-build - cmake .. - ../bin/debug/linux/MyGame - - Alternative 2 (howewer compile failed near 70% on unfound malloc/free): - export CC=/usr/bin/clang - export CXX=/usr/bin/clang++ - cocos new -l cpp -p com.firm.app myapp - mkdir linux-build && cd linux-build - cmake -G Ninja -DCLANG=ON .. - ../bin/debug/linux/MyGame - - - * Personnal preference (working on 3.5, to adujst if necessary) : - You can edit myapp/CMakeLists.txt to adjust personnal preference - (and speed up compile time, avoiding unnecessary things) - Here my personnal customisation : -set(DEBUG_MODE OFF CACHE BOOL "Debug or release? Release!") -set(BUILD_EXTENSIONS OFF CACHE BOOL "Turn off build extension library") -set(BUILD_EDITOR_SPINE OFF CACHE BOOL "Turn off build editor support for spine") -set(BUILD_EDITOR_COCOSTUDIO OFF CACHE BOOL "Turn off build editor support for cocostudio") -set(BUILD_EDITOR_COCOSBUILDER OFF CACHE BOOL "Turn off build editor support for cocosbuilder") -set(BUILD_CPP_TESTS OFF CACHE BOOL "Turn off build TestCpp samples") -set(BUILD_LUA_LIBS OFF CACHE BOOL "Turn off build lua libraries") -set(BUILD_LUA_TESTS OFF CACHE BOOL "Turn off build TestLua samples") - -I think that's all for the moment. -I hope you'll enjoy as mush as I am ! diff --git a/ccShader_3D_Color.frag.patch b/ccShader_3D_Color.frag.patch deleted file mode 100644 index 9e5297deb968..000000000000 --- a/ccShader_3D_Color.frag.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_3D_Color.frag 2017-03-22 15:13:34.000000000 -0400 -+++ /tmp/ccShader_3D_Color.frag 2017-04-21 06:42:23.465143013 -0400 -@@ -1,15 +1,15 @@ - --const char* cc3D_Color_frag = R"( -+const char* cc3D_Color_frag = STRINGIFY( - --#ifdef GL_ES -+\n#ifdef GL_ES\n - varying lowp vec4 DestinationColor; --#else -+\n#else\n - varying vec4 DestinationColor; --#endif -+\n#endif\n - uniform vec4 u_color; - - void main(void) - { - gl_FragColor = u_color; - } --)"; -+); diff --git a/ccShader_3D_ColorNormal.frag.patch b/ccShader_3D_ColorNormal.frag.patch deleted file mode 100644 index db928740549b..000000000000 --- a/ccShader_3D_ColorNormal.frag.patch +++ /dev/null @@ -1,134 +0,0 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_3D_ColorNormal.frag 2017-03-22 15:13:34.000000000 -0400 -+++ /tmp/ccShader_3D_ColorNormal.frag 2017-04-21 06:42:23.881812268 -0400 -@@ -1,49 +1,49 @@ - --const char* cc3D_ColorNormal_frag = R"( -+const char* cc3D_ColorNormal_frag = STRINGIFY( - --#if (MAX_DIRECTIONAL_LIGHT_NUM > 0) -+\n#if (MAX_DIRECTIONAL_LIGHT_NUM > 0)\n - uniform vec3 u_DirLightSourceColor[MAX_DIRECTIONAL_LIGHT_NUM]; - uniform vec3 u_DirLightSourceDirection[MAX_DIRECTIONAL_LIGHT_NUM]; --#endif --#if (MAX_POINT_LIGHT_NUM > 0) -+\n#endif\n -+\n#if (MAX_POINT_LIGHT_NUM > 0)\n - uniform vec3 u_PointLightSourceColor[MAX_POINT_LIGHT_NUM]; - uniform float u_PointLightSourceRangeInverse[MAX_POINT_LIGHT_NUM]; --#endif --#if (MAX_SPOT_LIGHT_NUM > 0) -+\n#endif\n -+\n#if (MAX_SPOT_LIGHT_NUM > 0)\n - uniform vec3 u_SpotLightSourceColor[MAX_SPOT_LIGHT_NUM]; - uniform vec3 u_SpotLightSourceDirection[MAX_SPOT_LIGHT_NUM]; - uniform float u_SpotLightSourceInnerAngleCos[MAX_SPOT_LIGHT_NUM]; - uniform float u_SpotLightSourceOuterAngleCos[MAX_SPOT_LIGHT_NUM]; - uniform float u_SpotLightSourceRangeInverse[MAX_SPOT_LIGHT_NUM]; --#endif -+\n#endif\n - uniform vec3 u_AmbientLightSourceColor; - --#ifdef GL_ES -+\n#ifdef GL_ES\n - varying mediump vec2 TextureCoordOut; --#if MAX_POINT_LIGHT_NUM -+\n#if MAX_POINT_LIGHT_NUM\n - varying mediump vec3 v_vertexToPointLightDirection[MAX_POINT_LIGHT_NUM]; --#endif --#if MAX_SPOT_LIGHT_NUM -+\n#endif\n -+\n#if MAX_SPOT_LIGHT_NUM\n - varying mediump vec3 v_vertexToSpotLightDirection[MAX_SPOT_LIGHT_NUM]; --#endif --#if ((MAX_DIRECTIONAL_LIGHT_NUM > 0) || (MAX_POINT_LIGHT_NUM > 0) || (MAX_SPOT_LIGHT_NUM > 0)) -+\n#endif\n -+\n#if ((MAX_DIRECTIONAL_LIGHT_NUM > 0) || (MAX_POINT_LIGHT_NUM > 0) || (MAX_SPOT_LIGHT_NUM > 0))\n - varying mediump vec3 v_normal; --#endif -+\n#endif\n - --#else -+\n#else\n - - varying vec2 TextureCoordOut; --#if MAX_POINT_LIGHT_NUM -+\n#if MAX_POINT_LIGHT_NUM\n - varying vec3 v_vertexToPointLightDirection[MAX_POINT_LIGHT_NUM]; --#endif --#if MAX_SPOT_LIGHT_NUM -+\n#endif\n -+\n#if MAX_SPOT_LIGHT_NUM\n - varying vec3 v_vertexToSpotLightDirection[MAX_SPOT_LIGHT_NUM]; --#endif --#if ((MAX_DIRECTIONAL_LIGHT_NUM > 0) || (MAX_POINT_LIGHT_NUM > 0) || (MAX_SPOT_LIGHT_NUM > 0)) -+\n#endif\n -+\n#if ((MAX_DIRECTIONAL_LIGHT_NUM > 0) || (MAX_POINT_LIGHT_NUM > 0) || (MAX_SPOT_LIGHT_NUM > 0))\n - varying vec3 v_normal; --#endif -+\n#endif\n - --#endif -+\n#endif\n - - uniform vec4 u_color; - -@@ -57,33 +57,33 @@ - - void main(void) - { --#if ((MAX_DIRECTIONAL_LIGHT_NUM > 0) || (MAX_POINT_LIGHT_NUM > 0) || (MAX_SPOT_LIGHT_NUM > 0)) -+\n#if ((MAX_DIRECTIONAL_LIGHT_NUM > 0) || (MAX_POINT_LIGHT_NUM > 0) || (MAX_SPOT_LIGHT_NUM > 0))\n - vec3 normal = normalize(v_normal); --#endif -+\n#endif\n - - vec4 combinedColor = vec4(u_AmbientLightSourceColor, 1.0); - - // Directional light contribution --#if (MAX_DIRECTIONAL_LIGHT_NUM > 0) -+\n#if (MAX_DIRECTIONAL_LIGHT_NUM > 0)\n - for (int i = 0; i < MAX_DIRECTIONAL_LIGHT_NUM; ++i) - { - vec3 lightDirection = normalize(u_DirLightSourceDirection[i] * 2.0); - combinedColor.xyz += computeLighting(normal, -lightDirection, u_DirLightSourceColor[i], 1.0); - } --#endif -+\n#endif\n - - // Point light contribution --#if (MAX_POINT_LIGHT_NUM > 0) -+\n#if (MAX_POINT_LIGHT_NUM > 0)\n - for (int i = 0; i < MAX_POINT_LIGHT_NUM; ++i) - { - vec3 ldir = v_vertexToPointLightDirection[i] * u_PointLightSourceRangeInverse[i]; - float attenuation = clamp(1.0 - dot(ldir, ldir), 0.0, 1.0); - combinedColor.xyz += computeLighting(normal, normalize(v_vertexToPointLightDirection[i]), u_PointLightSourceColor[i], attenuation); - } --#endif -+\n#endif\n - - // Spot light contribution --#if (MAX_SPOT_LIGHT_NUM > 0) -+\n#if (MAX_SPOT_LIGHT_NUM > 0)\n - for (int i = 0; i < MAX_SPOT_LIGHT_NUM; ++i) - { - // Compute range attenuation -@@ -101,13 +101,13 @@ - attenuation = clamp(attenuation, 0.0, 1.0); - combinedColor.xyz += computeLighting(normal, vertexToSpotLightDirection, u_SpotLightSourceColor[i], attenuation); - } --#endif -+\n#endif\n - --#if ((MAX_DIRECTIONAL_LIGHT_NUM > 0) || (MAX_POINT_LIGHT_NUM > 0) || (MAX_SPOT_LIGHT_NUM > 0)) -+\n#if ((MAX_DIRECTIONAL_LIGHT_NUM > 0) || (MAX_POINT_LIGHT_NUM > 0) || (MAX_SPOT_LIGHT_NUM > 0))\n - gl_FragColor = u_color * combinedColor; --#else -+\n#else\n - gl_FragColor = u_color; --#endif -+\n#endif\n - - } --)"; -+); diff --git a/ccShader_3D_ColorNormalTex.frag.patch b/ccShader_3D_ColorNormalTex.frag.patch deleted file mode 100644 index 485e97e06872..000000000000 --- a/ccShader_3D_ColorNormalTex.frag.patch +++ /dev/null @@ -1,214 +0,0 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_3D_ColorNormalTex.frag 2017-03-22 15:13:34.000000000 -0400 -+++ /tmp/ccShader_3D_ColorNormalTex.frag 2017-04-21 06:42:24.398482144 -0400 -@@ -1,78 +1,78 @@ - --const char* cc3D_ColorNormalTex_frag = R"( -+const char* cc3D_ColorNormalTex_frag = STRINGIFY( - --#if (MAX_DIRECTIONAL_LIGHT_NUM > 0) -+\n#if (MAX_DIRECTIONAL_LIGHT_NUM > 0)\n - uniform vec3 u_DirLightSourceColor[MAX_DIRECTIONAL_LIGHT_NUM]; - uniform vec3 u_DirLightSourceDirection[MAX_DIRECTIONAL_LIGHT_NUM]; --#endif --#if (MAX_POINT_LIGHT_NUM > 0) -+\n#endif\n -+\n#if (MAX_POINT_LIGHT_NUM > 0)\n - uniform vec3 u_PointLightSourceColor[MAX_POINT_LIGHT_NUM]; - uniform float u_PointLightSourceRangeInverse[MAX_POINT_LIGHT_NUM]; --#endif --#if (MAX_SPOT_LIGHT_NUM > 0) -+\n#endif\n -+\n#if (MAX_SPOT_LIGHT_NUM > 0)\n - uniform vec3 u_SpotLightSourceColor[MAX_SPOT_LIGHT_NUM]; - uniform vec3 u_SpotLightSourceDirection[MAX_SPOT_LIGHT_NUM]; - uniform float u_SpotLightSourceInnerAngleCos[MAX_SPOT_LIGHT_NUM]; - uniform float u_SpotLightSourceOuterAngleCos[MAX_SPOT_LIGHT_NUM]; - uniform float u_SpotLightSourceRangeInverse[MAX_SPOT_LIGHT_NUM]; --#endif -+\n#endif\n - uniform vec3 u_AmbientLightSourceColor; - --#ifdef GL_ES -+\n#ifdef GL_ES\n - varying mediump vec2 TextureCoordOut; - --#ifdef USE_NORMAL_MAPPING --#if MAX_DIRECTIONAL_LIGHT_NUM -+\n#ifdef USE_NORMAL_MAPPING\n -+\n#if MAX_DIRECTIONAL_LIGHT_NUM\n - varying mediump vec3 v_dirLightDirection[MAX_DIRECTIONAL_LIGHT_NUM]; --#endif --#endif --#if MAX_POINT_LIGHT_NUM -+\n#endif\n -+\n#endif\n -+\n#if MAX_POINT_LIGHT_NUM\n - varying mediump vec3 v_vertexToPointLightDirection[MAX_POINT_LIGHT_NUM]; --#endif --#if MAX_SPOT_LIGHT_NUM -+\n#endif\n -+\n#if MAX_SPOT_LIGHT_NUM\n - varying mediump vec3 v_vertexToSpotLightDirection[MAX_SPOT_LIGHT_NUM]; --#ifdef USE_NORMAL_MAPPING -+\n#ifdef USE_NORMAL_MAPPING\n - varying mediump vec3 v_spotLightDirection[MAX_SPOT_LIGHT_NUM]; --#endif --#endif -+\n#endif\n -+\n#endif\n - --#ifndef USE_NORMAL_MAPPING --#if ((MAX_DIRECTIONAL_LIGHT_NUM > 0) || (MAX_POINT_LIGHT_NUM > 0) || (MAX_SPOT_LIGHT_NUM > 0)) -+\n#ifndef USE_NORMAL_MAPPING\n -+\n#if ((MAX_DIRECTIONAL_LIGHT_NUM > 0) || (MAX_POINT_LIGHT_NUM > 0) || (MAX_SPOT_LIGHT_NUM > 0))\n - varying mediump vec3 v_normal; --#endif --#endif -+\n#endif\n -+\n#endif\n - --#else -+\n#else\n - - varying vec2 TextureCoordOut; - --#ifdef USE_NORMAL_MAPPING --#if MAX_DIRECTIONAL_LIGHT_NUM -+\n#ifdef USE_NORMAL_MAPPING\n -+\n#if MAX_DIRECTIONAL_LIGHT_NUM\n - varying vec3 v_dirLightDirection[MAX_DIRECTIONAL_LIGHT_NUM]; --#endif --#endif --#if MAX_POINT_LIGHT_NUM -+\n#endif\n -+\n#endif\n -+\n#if MAX_POINT_LIGHT_NUM\n - varying vec3 v_vertexToPointLightDirection[MAX_POINT_LIGHT_NUM]; --#endif --#if MAX_SPOT_LIGHT_NUM -+\n#endif\n -+\n#if MAX_SPOT_LIGHT_NUM\n - varying vec3 v_vertexToSpotLightDirection[MAX_SPOT_LIGHT_NUM]; --#ifdef USE_NORMAL_MAPPING -+\n#ifdef USE_NORMAL_MAPPING\n - varying vec3 v_spotLightDirection[MAX_SPOT_LIGHT_NUM]; --#endif --#endif -+\n#endif\n -+\n#endif\n - --#ifndef USE_NORMAL_MAPPING --#if ((MAX_DIRECTIONAL_LIGHT_NUM > 0) || (MAX_POINT_LIGHT_NUM > 0) || (MAX_SPOT_LIGHT_NUM > 0)) -+\n#ifndef USE_NORMAL_MAPPING\n -+\n#if ((MAX_DIRECTIONAL_LIGHT_NUM > 0) || (MAX_POINT_LIGHT_NUM > 0) || (MAX_SPOT_LIGHT_NUM > 0))\n - varying vec3 v_normal; --#endif --#endif -+\n#endif\n -+\n#endif\n - --#endif -+\n#endif\n - - uniform vec4 u_color; --#ifdef USE_NORMAL_MAPPING -+\n#ifdef USE_NORMAL_MAPPING\n - uniform sampler2D u_normalTex; --#endif -+\n#endif\n - - vec3 computeLighting(vec3 normalVector, vec3 lightDirection, vec3 lightColor, float attenuation) - { -@@ -85,43 +85,43 @@ - void main(void) - { - --#ifdef USE_NORMAL_MAPPING -- #if ((MAX_DIRECTIONAL_LIGHT_NUM > 0) || (MAX_POINT_LIGHT_NUM > 0) || (MAX_SPOT_LIGHT_NUM > 0)) -+\n#ifdef USE_NORMAL_MAPPING\n -+\n #if ((MAX_DIRECTIONAL_LIGHT_NUM > 0) || (MAX_POINT_LIGHT_NUM > 0) || (MAX_SPOT_LIGHT_NUM > 0))\n - vec3 normal = normalize(2.0 * texture2D(u_normalTex, TextureCoordOut).xyz - 1.0); -- #endif --#else -- #if ((MAX_DIRECTIONAL_LIGHT_NUM > 0) || (MAX_POINT_LIGHT_NUM > 0) || (MAX_SPOT_LIGHT_NUM > 0)) -+\n #endif\n -+\n#else\n -+\n #if ((MAX_DIRECTIONAL_LIGHT_NUM > 0) || (MAX_POINT_LIGHT_NUM > 0) || (MAX_SPOT_LIGHT_NUM > 0))\n - vec3 normal = normalize(v_normal); -- #endif --#endif -+\n #endif\n -+\n#endif\n - - vec4 combinedColor = vec4(u_AmbientLightSourceColor, 1.0); - - // Directional light contribution --#if (MAX_DIRECTIONAL_LIGHT_NUM > 0) -+\n#if (MAX_DIRECTIONAL_LIGHT_NUM > 0)\n - for (int i = 0; i < MAX_DIRECTIONAL_LIGHT_NUM; ++i) - { --#ifdef USE_NORMAL_MAPPING -+\n#ifdef USE_NORMAL_MAPPING\n - vec3 lightDirection = normalize(v_dirLightDirection[i] * 2.0); --#else -+\n#else\n - vec3 lightDirection = normalize(u_DirLightSourceDirection[i] * 2.0); --#endif -+\n#endif\n - combinedColor.xyz += computeLighting(normal, -lightDirection, u_DirLightSourceColor[i], 1.0); - } --#endif -+\n#endif\n - - // Point light contribution --#if (MAX_POINT_LIGHT_NUM > 0) -+\n#if (MAX_POINT_LIGHT_NUM > 0)\n - for (int i = 0; i < MAX_POINT_LIGHT_NUM; ++i) - { - vec3 ldir = v_vertexToPointLightDirection[i] * u_PointLightSourceRangeInverse[i]; - float attenuation = clamp(1.0 - dot(ldir, ldir), 0.0, 1.0); - combinedColor.xyz += computeLighting(normal, normalize(v_vertexToPointLightDirection[i]), u_PointLightSourceColor[i], attenuation); - } --#endif -+\n#endif\n - - // Spot light contribution --#if (MAX_SPOT_LIGHT_NUM > 0) -+\n#if (MAX_SPOT_LIGHT_NUM > 0)\n - for (int i = 0; i < MAX_SPOT_LIGHT_NUM; ++i) - { - // Compute range attenuation -@@ -129,11 +129,11 @@ - float attenuation = clamp(1.0 - dot(ldir, ldir), 0.0, 1.0); - vec3 vertexToSpotLightDirection = normalize(v_vertexToSpotLightDirection[i]); - --#ifdef USE_NORMAL_MAPPING -+\n#ifdef USE_NORMAL_MAPPING\n - vec3 spotLightDirection = normalize(v_spotLightDirection[i] * 2.0); --#else -+\n#else\n - vec3 spotLightDirection = normalize(u_SpotLightSourceDirection[i] * 2.0); --#endif -+\n#endif\n - - // "-lightDirection" is used because light direction points in opposite direction to spot direction. - float spotCurrentAngleCos = dot(spotLightDirection, -vertexToSpotLightDirection); -@@ -143,13 +143,13 @@ - attenuation = clamp(attenuation, 0.0, 1.0); - combinedColor.xyz += computeLighting(normal, vertexToSpotLightDirection, u_SpotLightSourceColor[i], attenuation); - } --#endif -+\n#endif\n - --#if ((MAX_DIRECTIONAL_LIGHT_NUM > 0) || (MAX_POINT_LIGHT_NUM > 0) || (MAX_SPOT_LIGHT_NUM > 0)) -+\n#if ((MAX_DIRECTIONAL_LIGHT_NUM > 0) || (MAX_POINT_LIGHT_NUM > 0) || (MAX_SPOT_LIGHT_NUM > 0))\n - gl_FragColor = texture2D(CC_Texture0, TextureCoordOut) * u_color * combinedColor; --#else -+\n#else\n - gl_FragColor = texture2D(CC_Texture0, TextureCoordOut) * u_color; --#endif -+\n#endif\n - - } --)"; -+); diff --git a/ccShader_3D_ColorTex.frag.patch b/ccShader_3D_ColorTex.frag.patch deleted file mode 100644 index 77947cb7c2bf..000000000000 --- a/ccShader_3D_ColorTex.frag.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_3D_ColorTex.frag 2017-03-22 15:13:34.000000000 -0400 -+++ /tmp/ccShader_3D_ColorTex.frag 2017-04-21 06:42:23.848478727 -0400 -@@ -1,15 +1,15 @@ - --const char* cc3D_ColorTex_frag = R"( -+const char* cc3D_ColorTex_frag = STRINGIFY( - --#ifdef GL_ES -+\n#ifdef GL_ES\n - varying mediump vec2 TextureCoordOut; --#else -+\n#else\n - varying vec2 TextureCoordOut; --#endif -+\n#endif\n - uniform vec4 u_color; - - void main(void) - { - gl_FragColor = texture2D(CC_Texture0, TextureCoordOut) * u_color; - } --)"; -+); diff --git a/ccShader_3D_Particle.frag.patch b/ccShader_3D_Particle.frag.patch deleted file mode 100644 index ece1880a7395..000000000000 --- a/ccShader_3D_Particle.frag.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_3D_Particle.frag 2017-03-22 15:13:34.000000000 -0400 -+++ /tmp/ccShader_3D_Particle.frag 2017-04-21 06:42:23.361809038 -0400 -@@ -1,20 +1,20 @@ - --const char* cc3D_Particle_tex_frag = R"( -+const char* cc3D_Particle_tex_frag = STRINGIFY( - --#ifdef GL_ES -+\n#ifdef GL_ES\n - varying mediump vec2 TextureCoordOut; - varying mediump vec4 ColorOut; --#else -+\n#else\n - varying vec4 ColorOut; - varying vec2 TextureCoordOut; --#endif -+\n#endif\n - uniform vec4 u_color; - - void main(void) - { - gl_FragColor = texture2D(CC_Texture0, TextureCoordOut) * ColorOut * u_color; - } --)"; -+); - - const char* cc3D_Particle_color_frag = R"( - diff --git a/ccShader_3D_Particle.vert.patch b/ccShader_3D_Particle.vert.patch deleted file mode 100644 index 7b0d25e5da45..000000000000 --- a/ccShader_3D_Particle.vert.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_3D_Particle.vert 2017-03-22 15:13:34.000000000 -0400 -+++ /tmp/ccShader_3D_Particle.vert 2017-04-21 06:42:23.658477547 -0400 -@@ -1,5 +1,5 @@ - --const char* cc3D_Particle_vert = R"( -+const char* cc3D_Particle_vert = STRINGIFY( - - attribute vec4 a_position; - attribute vec4 a_color; -@@ -15,4 +15,4 @@ - gl_Position = CC_PMatrix * a_position; - } - --)"; -\ No newline at end of file -+); -\ No newline at end of file diff --git a/ccShader_3D_PositionNormalTex.vert.patch b/ccShader_3D_PositionNormalTex.vert.patch deleted file mode 100644 index 3437654346de..000000000000 --- a/ccShader_3D_PositionNormalTex.vert.patch +++ /dev/null @@ -1,161 +0,0 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_3D_PositionNormalTex.vert 2017-03-22 15:13:34.000000000 -0400 -+++ /tmp/ccShader_3D_PositionNormalTex.vert 2017-04-21 06:42:23.945145995 -0400 -@@ -1,70 +1,70 @@ - --const char* cc3D_PositionNormalTex_vert = R"( -+const char* cc3D_PositionNormalTex_vert = STRINGIFY( - --#ifdef USE_NORMAL_MAPPING --#if (MAX_DIRECTIONAL_LIGHT_NUM > 0) -+\n#ifdef USE_NORMAL_MAPPING\n -+\n#if (MAX_DIRECTIONAL_LIGHT_NUM > 0)\n - uniform vec3 u_DirLightSourceDirection[MAX_DIRECTIONAL_LIGHT_NUM]; --#endif --#endif --#if (MAX_POINT_LIGHT_NUM > 0) -+\n#endif\n -+\n#endif\n -+\n#if (MAX_POINT_LIGHT_NUM > 0)\n - uniform vec3 u_PointLightSourcePosition[MAX_POINT_LIGHT_NUM]; --#endif --#if (MAX_SPOT_LIGHT_NUM > 0) -+\n#endif\n -+\n#if (MAX_SPOT_LIGHT_NUM > 0)\n - uniform vec3 u_SpotLightSourcePosition[MAX_SPOT_LIGHT_NUM]; --#ifdef USE_NORMAL_MAPPING -+\n#ifdef USE_NORMAL_MAPPING\n - uniform vec3 u_SpotLightSourceDirection[MAX_SPOT_LIGHT_NUM]; --#endif --#endif -+\n#endif\n -+\n#endif\n - - attribute vec4 a_position; - attribute vec2 a_texCoord; - attribute vec3 a_normal; --#ifdef USE_NORMAL_MAPPING -+\n#ifdef USE_NORMAL_MAPPING\n - attribute vec3 a_tangent; - attribute vec3 a_binormal; --#endif -+\n#endif\n - varying vec2 TextureCoordOut; - --#ifdef USE_NORMAL_MAPPING --#if MAX_DIRECTIONAL_LIGHT_NUM -+\n#ifdef USE_NORMAL_MAPPING\n -+\n#if MAX_DIRECTIONAL_LIGHT_NUM\n - varying vec3 v_dirLightDirection[MAX_DIRECTIONAL_LIGHT_NUM]; --#endif --#endif --#if MAX_POINT_LIGHT_NUM -+\n#endif\n -+\n#endif\n -+\n#if MAX_POINT_LIGHT_NUM\n - varying vec3 v_vertexToPointLightDirection[MAX_POINT_LIGHT_NUM]; --#endif --#if MAX_SPOT_LIGHT_NUM -+\n#endif\n -+\n#if MAX_SPOT_LIGHT_NUM\n - varying vec3 v_vertexToSpotLightDirection[MAX_SPOT_LIGHT_NUM]; --#ifdef USE_NORMAL_MAPPING -+\n#ifdef USE_NORMAL_MAPPING\n - varying vec3 v_spotLightDirection[MAX_SPOT_LIGHT_NUM]; --#endif --#endif -+\n#endif\n -+\n#endif\n - --#ifndef USE_NORMAL_MAPPING --#if ((MAX_DIRECTIONAL_LIGHT_NUM > 0) || (MAX_POINT_LIGHT_NUM > 0) || (MAX_SPOT_LIGHT_NUM > 0)) -+\n#ifndef USE_NORMAL_MAPPING\n -+\n#if ((MAX_DIRECTIONAL_LIGHT_NUM > 0) || (MAX_POINT_LIGHT_NUM > 0) || (MAX_SPOT_LIGHT_NUM > 0))\n - varying vec3 v_normal; --#endif --#endif -+\n#endif\n -+\n#endif\n - - void main(void) - { - vec4 ePosition = CC_MVMatrix * a_position; --#ifdef USE_NORMAL_MAPPING -- #if ((MAX_DIRECTIONAL_LIGHT_NUM > 0) || (MAX_POINT_LIGHT_NUM > 0) || (MAX_SPOT_LIGHT_NUM > 0)) -+\n#ifdef USE_NORMAL_MAPPING\n -+\n #if ((MAX_DIRECTIONAL_LIGHT_NUM > 0) || (MAX_POINT_LIGHT_NUM > 0) || (MAX_SPOT_LIGHT_NUM > 0))\n - vec3 eTangent = normalize(CC_NormalMatrix * a_tangent); - vec3 eBinormal = normalize(CC_NormalMatrix * a_binormal); - vec3 eNormal = normalize(CC_NormalMatrix * a_normal); -- #endif -- #if (MAX_DIRECTIONAL_LIGHT_NUM > 0) -+\n #endif\n -+\n #if (MAX_DIRECTIONAL_LIGHT_NUM > 0)\n - for (int i = 0; i < MAX_DIRECTIONAL_LIGHT_NUM; ++i) - { - v_dirLightDirection[i].x = dot(eTangent, u_DirLightSourceDirection[i]); - v_dirLightDirection[i].y = dot(eBinormal, u_DirLightSourceDirection[i]); - v_dirLightDirection[i].z = dot(eNormal, u_DirLightSourceDirection[i]); - } -- #endif -+\n #endif\n - -- #if (MAX_POINT_LIGHT_NUM > 0) -+\n #if (MAX_POINT_LIGHT_NUM > 0)\n - for (int i = 0; i < MAX_POINT_LIGHT_NUM; ++i) - { - vec3 pointLightDir = u_PointLightSourcePosition[i].xyz - ePosition.xyz; -@@ -72,9 +72,9 @@ - v_vertexToPointLightDirection[i].y = dot(eBinormal, pointLightDir); - v_vertexToPointLightDirection[i].z = dot(eNormal, pointLightDir); - } -- #endif -+\n #endif\n - -- #if (MAX_SPOT_LIGHT_NUM > 0) -+\n #if (MAX_SPOT_LIGHT_NUM > 0)\n - for (int i = 0; i < MAX_SPOT_LIGHT_NUM; ++i) - { - vec3 spotLightDir = u_SpotLightSourcePosition[i] - ePosition.xyz; -@@ -86,32 +86,32 @@ - v_spotLightDirection[i].y = dot(eBinormal, u_SpotLightSourceDirection[i]); - v_spotLightDirection[i].z = dot(eNormal, u_SpotLightSourceDirection[i]); - } -- #endif --#else -- #if (MAX_POINT_LIGHT_NUM > 0) -+\n #endif\n -+\n#else\n -+\n #if (MAX_POINT_LIGHT_NUM > 0)\n - for (int i = 0; i < MAX_POINT_LIGHT_NUM; ++i) - { - v_vertexToPointLightDirection[i] = u_PointLightSourcePosition[i].xyz - ePosition.xyz; - } -- #endif -+\n #endif\n - -- #if (MAX_SPOT_LIGHT_NUM > 0) -+\n #if (MAX_SPOT_LIGHT_NUM > 0)\n - for (int i = 0; i < MAX_SPOT_LIGHT_NUM; ++i) - { - v_vertexToSpotLightDirection[i] = u_SpotLightSourcePosition[i] - ePosition.xyz; - } -- #endif -+\n #endif\n - -- #if ((MAX_DIRECTIONAL_LIGHT_NUM > 0) || (MAX_POINT_LIGHT_NUM > 0) || (MAX_SPOT_LIGHT_NUM > 0)) -+\n #if ((MAX_DIRECTIONAL_LIGHT_NUM > 0) || (MAX_POINT_LIGHT_NUM > 0) || (MAX_SPOT_LIGHT_NUM > 0))\n - v_normal = CC_NormalMatrix * a_normal; -- #endif --#endif -+\n #endif\n -+\n#endif\n - - TextureCoordOut = a_texCoord; - TextureCoordOut.y = 1.0 - TextureCoordOut.y; - gl_Position = CC_PMatrix * ePosition; - } --)"; -+); - - const char* cc3D_SkinPositionNormalTex_vert = R"( - diff --git a/ccShader_3D_PositionTex.vert.patch b/ccShader_3D_PositionTex.vert.patch deleted file mode 100644 index d2947ac38689..000000000000 --- a/ccShader_3D_PositionTex.vert.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_3D_PositionTex.vert 2017-03-22 15:13:34.000000000 -0400 -+++ /tmp/ccShader_3D_PositionTex.vert 2017-04-21 06:42:24.205147609 -0400 -@@ -1,5 +1,5 @@ - --const char* cc3D_PositionTex_vert = R"( -+const char* cc3D_PositionTex_vert = STRINGIFY( - - attribute vec4 a_position; - attribute vec2 a_texCoord; -@@ -12,7 +12,7 @@ - TextureCoordOut = a_texCoord; - TextureCoordOut.y = 1.0 - TextureCoordOut.y; - } --)"; -+); - - const char* cc3D_SkinPositionTex_vert = R"( - attribute vec3 a_position; diff --git a/ccShader_3D_Skybox.frag.patch b/ccShader_3D_Skybox.frag.patch deleted file mode 100644 index e1daffa3c0fe..000000000000 --- a/ccShader_3D_Skybox.frag.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_3D_Skybox.frag 2017-03-22 15:13:34.000000000 -0400 -+++ /tmp/ccShader_3D_Skybox.frag 2017-04-21 06:42:24.531816306 -0400 -@@ -1,9 +1,9 @@ --const char* cc3D_Skybox_frag = R"( --#ifdef GL_ES -+const char* cc3D_Skybox_frag = STRINGIFY( -+\n#ifdef GL_ES\n - varying mediump vec3 v_reflect; --#else -+\n#else\n - varying vec3 v_reflect; --#endif -+\n#endif\n - uniform samplerCube u_Env; - uniform vec4 u_color; - -@@ -11,4 +11,4 @@ - { - gl_FragColor = textureCube(u_Env, v_reflect) * u_color; - } --)"; -+); diff --git a/ccShader_3D_Skybox.vert.patch b/ccShader_3D_Skybox.vert.patch deleted file mode 100644 index 3b67a93ee6e7..000000000000 --- a/ccShader_3D_Skybox.vert.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_3D_Skybox.vert 2017-03-22 15:13:34.000000000 -0400 -+++ /tmp/ccShader_3D_Skybox.vert 2017-04-21 06:42:24.008479722 -0400 -@@ -1,4 +1,4 @@ --const char* cc3D_Skybox_vert = R"( -+const char* cc3D_Skybox_vert = STRINGIFY( - - uniform mat4 u_cameraRot; - attribute vec3 a_position; -@@ -10,4 +10,4 @@ - v_reflect = reflect.xyz; - gl_Position = vec4(a_position.xy, 1.0 , 1.0); - } --)"; -\ No newline at end of file -+); -\ No newline at end of file diff --git a/ccShader_3D_Terrain.frag.patch b/ccShader_3D_Terrain.frag.patch deleted file mode 100644 index c9790afc1acd..000000000000 --- a/ccShader_3D_Terrain.frag.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_3D_Terrain.frag 2017-03-22 15:13:34.000000000 -0400 -+++ /tmp/ccShader_3D_Terrain.frag 2017-04-21 06:42:24.331815063 -0400 -@@ -1,18 +1,18 @@ - --const char* cc3D_Terrain_frag = R"( --#ifdef GL_ES -+const char* cc3D_Terrain_frag = STRINGIFY( -+\n#ifdef GL_ES\n - precision mediump float; --#endif -+\n#endif\n - uniform vec3 u_color; - varying vec2 v_texCoord; - varying vec3 v_normal; --#ifdef GL_ES -+\n#ifdef GL_ES\n - uniform lowp int u_has_alpha; - uniform lowp int u_has_light_map; --#else -+\n#else\n - uniform int u_has_alpha; - uniform int u_has_light_map; --#endif -+\n#endif\n - uniform sampler2D u_alphaMap; - uniform sampler2D u_texture0; - uniform sampler2D u_texture1; -@@ -45,4 +45,4 @@ - gl_FragColor = vec4(color.rgb*lightColor.rgb*lightFactor, 1.0); - } - } --)"; -+); diff --git a/ccShader_3D_Terrain.vert.patch b/ccShader_3D_Terrain.vert.patch deleted file mode 100644 index 0cd522a4a710..000000000000 --- a/ccShader_3D_Terrain.vert.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_3D_Terrain.vert 2017-03-22 15:13:34.000000000 -0400 -+++ /tmp/ccShader_3D_Terrain.vert 2017-04-21 06:42:23.978479536 -0400 -@@ -1,19 +1,19 @@ - --const char* cc3D_Terrain_vert = R"( -+const char* cc3D_Terrain_vert = STRINGIFY( - attribute vec4 a_position; - attribute vec2 a_texCoord; - attribute vec3 a_normal; --#ifdef GL_ES -+\n#ifdef GL_ES\n - varying mediump vec2 v_texCoord; - varying mediump vec3 v_normal; --#else -+\n#else\n - varying vec2 v_texCoord; - varying vec3 v_normal; --#endif -+\n#endif\n - void main() - { - gl_Position = CC_MVPMatrix * a_position; - v_texCoord = a_texCoord; - v_normal = a_normal; - } --)"; -+); diff --git a/ccShader_CameraClear.frag.patch b/ccShader_CameraClear.frag.patch deleted file mode 100644 index a17c6642876b..000000000000 --- a/ccShader_CameraClear.frag.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_CameraClear.frag 2017-03-22 15:13:34.000000000 -0400 -+++ /tmp/ccShader_CameraClear.frag 2017-04-21 06:42:23.295141958 -0400 -@@ -1,15 +1,15 @@ - --const char* ccCameraClearFrag = R"( -+const char* ccCameraClearFrag = STRINGIFY( - --#ifdef GL_ES -+\n#ifdef GL_ES\n - varying mediump vec2 v_texCoord; - varying mediump vec3 v_color; --#else -+\n#else\n - varying vec2 v_texCoord; - varying vec3 v_color; --#endif -+\n#endif\n - void main() - { - gl_FragColor = vec4(v_color, 1.0); - } --)"; -+); diff --git a/ccShader_CameraClear.vert.patch b/ccShader_CameraClear.vert.patch deleted file mode 100644 index 6699ceefb436..000000000000 --- a/ccShader_CameraClear.vert.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_CameraClear.vert 2017-03-22 15:13:34.000000000 -0400 -+++ /tmp/ccShader_CameraClear.vert 2017-04-21 06:42:23.625144008 -0400 -@@ -1,18 +1,18 @@ - --const char* ccCameraClearVert = R"( -+const char* ccCameraClearVert = STRINGIFY( - - uniform float depth; - - attribute vec4 a_position; - attribute vec2 a_texCoord; - attribute vec3 a_color; --#ifdef GL_ES -+\n#ifdef GL_ES\n - varying mediump vec2 v_texCoord; - varying mediump vec3 v_color; --#else -+\n#else\n - varying vec2 v_texCoord; - varying vec3 v_color; --#endif -+\n#endif\n - void main() - { - gl_Position = a_position; -@@ -21,4 +21,4 @@ - v_texCoord = a_texCoord; - v_color = a_color; - } --)"; -+); diff --git a/ccShader_ETC1AS_PositionTextureColor.frag.patch b/ccShader_ETC1AS_PositionTextureColor.frag.patch deleted file mode 100644 index bd824e380b8a..000000000000 --- a/ccShader_ETC1AS_PositionTextureColor.frag.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_ETC1AS_PositionTextureColor.frag 2017-03-22 15:13:34.000000000 -0400 -+++ /tmp/ccShader_ETC1AS_PositionTextureColor.frag 2017-04-21 06:42:24.661817113 -0400 -@@ -23,10 +23,10 @@ - * THE SOFTWARE. - */ - --const char* ccETC1ASPositionTextureColor_frag = R"( --#ifdef GL_ES -+const char* ccETC1ASPositionTextureColor_frag = STRINGIFY( -+\n#ifdef GL_ES\n - precision mediump float; --#endif -+\n#endif\n - - varying vec4 v_fragmentColor; - varying vec2 v_texCoord; -@@ -38,4 +38,4 @@ - - gl_FragColor = v_fragmentColor * texColor; - } --)"; -+); diff --git a/ccShader_ETC1AS_PositionTextureGray.frag.patch b/ccShader_ETC1AS_PositionTextureGray.frag.patch deleted file mode 100644 index ce1e86420a42..000000000000 --- a/ccShader_ETC1AS_PositionTextureGray.frag.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_ETC1AS_PositionTextureGray.frag 2017-03-22 15:13:34.000000000 -0400 -+++ /tmp/ccShader_ETC1AS_PositionTextureGray.frag 2017-04-21 06:42:23.725144629 -0400 -@@ -23,10 +23,10 @@ - * THE SOFTWARE. - */ - --const char* ccETC1ASPositionTextureGray_frag = R"( --#ifdef GL_ES -+const char* ccETC1ASPositionTextureGray_frag = STRINGIFY( -+\n#ifdef GL_ES\n - precision mediump float; --#endif -+\n#endif\n - - varying vec4 v_fragmentColor; - varying vec2 v_texCoord; -@@ -42,4 +42,4 @@ - gl_FragColor.rgb = vec3(0.2126*texColor.r + 0.7152*texColor.g + 0.0722*texColor.b); - gl_FragColor.a = texColor.a; - } --)"; -+); diff --git a/ccShader_Label.vert.patch b/ccShader_Label.vert.patch deleted file mode 100644 index 2a1f5c5a36ca..000000000000 --- a/ccShader_Label.vert.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_Label.vert 2017-03-22 15:13:34.000000000 -0400 -+++ /tmp/ccShader_Label.vert 2017-04-21 06:42:24.271814691 -0400 -@@ -23,19 +23,19 @@ - * THE SOFTWARE. - */ - --const char* ccLabel_vert = R"( -+const char* ccLabel_vert = STRINGIFY( - - attribute vec4 a_position; - attribute vec2 a_texCoord; - attribute vec4 a_color; - --#ifdef GL_ES -+\n#ifdef GL_ES\n - varying lowp vec4 v_fragmentColor; - varying mediump vec2 v_texCoord; --#else -+\n#else\n - varying vec4 v_fragmentColor; - varying vec2 v_texCoord; --#endif -+\n#endif\n - - void main() - { -@@ -43,4 +43,4 @@ - v_fragmentColor = a_color; - v_texCoord = a_texCoord; - } --)"; -+); diff --git a/ccShader_Label_df.frag.patch b/ccShader_Label_df.frag.patch deleted file mode 100644 index 1390f21e6637..000000000000 --- a/ccShader_Label_df.frag.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_Label_df.frag 2017-03-22 15:13:34.000000000 -0400 -+++ /tmp/ccShader_Label_df.frag 2017-04-21 06:42:23.561810281 -0400 -@@ -1,8 +1,8 @@ --const char* ccLabelDistanceFieldNormal_frag = R"( -+const char* ccLabelDistanceFieldNormal_frag = STRINGIFY( - --#ifdef GL_ES -+\n#ifdef GL_ES\n - precision lowp float; --#endif -+\n#endif\n - - varying vec4 v_fragmentColor; - varying vec2 v_texCoord; -@@ -23,4 +23,4 @@ - 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/ccShader_Label_df_glow.frag.patch b/ccShader_Label_df_glow.frag.patch deleted file mode 100644 index 579dbc7068aa..000000000000 --- a/ccShader_Label_df_glow.frag.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_Label_df_glow.frag 2017-03-22 15:13:34.000000000 -0400 -+++ /tmp/ccShader_Label_df_glow.frag 2017-04-21 06:42:23.691811088 -0400 -@@ -1,8 +1,8 @@ --const char* ccLabelDistanceFieldGlow_frag = R"( -+const char* ccLabelDistanceFieldGlow_frag = STRINGIFY( - --#ifdef GL_ES -+\n#ifdef GL_ES\n - precision lowp float; --#endif -+\n#endif\n - - varying vec4 v_fragmentColor; - varying vec2 v_texCoord; -@@ -23,4 +23,4 @@ - vec4 color = u_effectColor*(1.0-alpha) + u_textColor*alpha; - gl_FragColor = v_fragmentColor * vec4(color.rgb, max(alpha,mu)*color.a); - } --)"; -+); diff --git a/ccShader_Label_normal.frag.patch b/ccShader_Label_normal.frag.patch deleted file mode 100644 index 46d7a7fade11..000000000000 --- a/ccShader_Label_normal.frag.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_Label_normal.frag 2017-03-22 15:13:34.000000000 -0400 -+++ /tmp/ccShader_Label_normal.frag 2017-04-21 06:42:23.395142579 -0400 -@@ -23,10 +23,10 @@ - * THE SOFTWARE. - */ - --const char* ccLabelNormal_frag = R"( --#ifdef GL_ES -+const char* ccLabelNormal_frag = STRINGIFY( -+\n#ifdef GL_ES\n - precision lowp float; --#endif -+\n#endif\n - - varying vec4 v_fragmentColor; - varying vec2 v_texCoord; -@@ -39,4 +39,4 @@ - u_textColor.a * texture2D(CC_Texture0, v_texCoord).a// A from texture & uniform - ); - } --)"; -+); diff --git a/ccShader_Label_outline.frag.patch b/ccShader_Label_outline.frag.patch deleted file mode 100644 index 4a8efc05d99e..000000000000 --- a/ccShader_Label_outline.frag.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_Label_outline.frag 2017-03-22 15:13:34.000000000 -0400 -+++ /tmp/ccShader_Label_outline.frag 2017-04-21 06:42:23.428476119 -0400 -@@ -1,10 +1,10 @@ - /* - * LICENSE ??? - */ --const char* ccLabelOutline_frag = R"( --#ifdef GL_ES -+const char* ccLabelOutline_frag = STRINGIFY( -+\n#ifdef GL_ES\n - precision lowp float; --#endif -+\n#endif\n - - varying vec4 v_fragmentColor; - varying vec2 v_texCoord; -@@ -12,11 +12,11 @@ - uniform vec4 u_effectColor; - uniform vec4 u_textColor; - --#ifdef GL_ES -+\n#ifdef GL_ES\n - uniform lowp int u_effectType; // 0: None (Draw text), 1: Outline, 2: Shadow --#else -+\n#else\n - uniform int u_effectType; --#endif -+\n#endif\n - - void main() - { -@@ -45,4 +45,4 @@ - gl_FragColor = v_fragmentColor * vec4(u_effectColor.rgb, u_effectColor.a * outlineAlpha); - } - } --)"; -+); diff --git a/ccShader_PositionColor.frag.patch b/ccShader_PositionColor.frag.patch deleted file mode 100644 index a1a3a59e1b51..000000000000 --- a/ccShader_PositionColor.frag.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_PositionColor.frag 2017-03-22 15:13:34.000000000 -0400 -+++ /tmp/ccShader_PositionColor.frag 2017-04-21 06:42:24.075146802 -0400 -@@ -23,11 +23,11 @@ - * THE SOFTWARE. - */ - --const char* ccPositionColor_frag = R"( -+const char* ccPositionColor_frag = STRINGIFY( - --#ifdef GL_ES -+\n#ifdef GL_ES\n - precision lowp float; --#endif -+\n#endif\n - - varying vec4 v_fragmentColor; - -@@ -35,4 +35,4 @@ - { - gl_FragColor = v_fragmentColor; - } --)"; -+); diff --git a/ccShader_PositionColor.vert.patch b/ccShader_PositionColor.vert.patch deleted file mode 100644 index a229d6090458..000000000000 --- a/ccShader_PositionColor.vert.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_PositionColor.vert 2017-03-22 15:13:34.000000000 -0400 -+++ /tmp/ccShader_PositionColor.vert 2017-04-21 06:42:24.365148604 -0400 -@@ -23,20 +23,20 @@ - * THE SOFTWARE. - */ - --const char* ccPositionColor_vert = R"( -+const char* ccPositionColor_vert = STRINGIFY( - - attribute vec4 a_position; - attribute vec4 a_color; - --#ifdef GL_ES -+\n#ifdef GL_ES\n - varying lowp vec4 v_fragmentColor; --#else -+\n#else\n - varying vec4 v_fragmentColor; --#endif -+\n#endif\n - - void main() - { - gl_Position = CC_MVPMatrix * a_position; - v_fragmentColor = a_color; - } --)"; -+); diff --git a/ccShader_PositionColorLengthTexture.frag.patch b/ccShader_PositionColorLengthTexture.frag.patch deleted file mode 100644 index 8b365781a2d0..000000000000 --- a/ccShader_PositionColorLengthTexture.frag.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_PositionColorLengthTexture.frag 2017-03-22 15:13:34.000000000 -0400 -+++ /tmp/ccShader_PositionColorLengthTexture.frag 2017-04-21 06:42:23.751811461 -0400 -@@ -19,17 +19,17 @@ - * SOFTWARE. - */ - --const char* ccPositionColorLengthTexture_frag = R"( -+const char* ccPositionColorLengthTexture_frag = STRINGIFY( - --#ifdef GL_ES -+\n#ifdef GL_ES\n - // #extension GL_OES_standard_derivatives : enable - - varying mediump vec4 v_color; - varying mediump vec2 v_texcoord; --#else -+\n#else\n - varying vec4 v_color; - varying vec2 v_texcoord; --#endif -+\n#endif\n - - void main() - { -@@ -39,4 +39,4 @@ - gl_FragColor = v_color*step(0.0, 1.0 - length(v_texcoord)); - // #endif - } --)"; -+); diff --git a/ccShader_PositionColorLengthTexture.vert.patch b/ccShader_PositionColorLengthTexture.vert.patch deleted file mode 100644 index 285f03b058fb..000000000000 --- a/ccShader_PositionColorLengthTexture.vert.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_PositionColorLengthTexture.vert 2017-04-12 15:00:32.000000000 -0400 -+++ /tmp/ccShader_PositionColorLengthTexture.vert 2017-04-21 06:42:24.495149411 -0400 -@@ -19,13 +19,13 @@ - * SOFTWARE. - */ - --const char* ccPositionColorLengthTexture_vert = R"( -+const char* ccPositionColorLengthTexture_vert = STRINGIFY( - --#ifdef GL_ES -+\n#ifdef GL_ES\n - precision lowp float; --#endif -+\n#endif\n - --#ifdef GL_ES -+\n#ifdef GL_ES\n - attribute mediump vec4 a_position; - attribute mediump vec2 a_texcoord; - attribute mediump vec4 a_color; -@@ -33,7 +33,7 @@ - varying mediump vec4 v_color; - varying mediump vec2 v_texcoord; - --#else -+\n#else\n - - attribute vec4 a_position; - attribute vec2 a_texcoord; -@@ -42,7 +42,7 @@ - varying vec4 v_color; - varying vec2 v_texcoord; - --#endif -+\n#endif\n - - uniform float u_alpha; - -@@ -53,4 +53,4 @@ - - gl_Position = CC_MVPMatrix * a_position; - } --)"; -+); diff --git a/ccShader_PositionColorTextureAsPointsize.vert.patch b/ccShader_PositionColorTextureAsPointsize.vert.patch deleted file mode 100644 index 96d772772e02..000000000000 --- a/ccShader_PositionColorTextureAsPointsize.vert.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_PositionColorTextureAsPointsize.vert 2017-04-12 15:00:32.000000000 -0400 -+++ /tmp/ccShader_PositionColorTextureAsPointsize.vert 2017-04-21 06:42:23.528476740 -0400 -@@ -22,18 +22,18 @@ - * THE SOFTWARE. - */ - --const char* ccPositionColorTextureAsPointsize_vert = R"( -+const char* ccPositionColorTextureAsPointsize_vert = STRINGIFY( - - attribute vec4 a_position; - attribute vec4 a_color; - - attribute vec2 a_texCoord; - --#ifdef GL_ES -+\n#ifdef GL_ES\n - varying lowp vec4 v_fragmentColor; --#else -+\n#else\n - varying vec4 v_fragmentColor; --#endif -+\n#endif\n - uniform float u_alpha; - - void main() -@@ -42,4 +42,4 @@ - gl_PointSize = a_texCoord.x; - v_fragmentColor = vec4(a_color.rgb * a_color.a * u_alpha, a_color.a * u_alpha); - } --)"; -+); diff --git a/ccShader_PositionTexture.frag.patch b/ccShader_PositionTexture.frag.patch deleted file mode 100644 index f1d5febea7cc..000000000000 --- a/ccShader_PositionTexture.frag.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_PositionTexture.frag 2017-03-22 15:13:34.000000000 -0400 -+++ /tmp/ccShader_PositionTexture.frag 2017-04-21 06:42:23.591810467 -0400 -@@ -23,11 +23,11 @@ - * THE SOFTWARE. - */ - --const char* ccPositionTexture_frag = R"( -+const char* ccPositionTexture_frag = STRINGIFY( - --#ifdef GL_ES -+\n#ifdef GL_ES\n - precision lowp float; --#endif -+\n#endif\n - - varying vec2 v_texCoord; - -@@ -35,4 +35,4 @@ - { - gl_FragColor = texture2D(CC_Texture0, v_texCoord); - } --)"; -+); diff --git a/ccShader_PositionTexture.vert.patch b/ccShader_PositionTexture.vert.patch deleted file mode 100644 index 0f0253ef1060..000000000000 --- a/ccShader_PositionTexture.vert.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_PositionTexture.vert 2017-03-22 15:13:34.000000000 -0400 -+++ /tmp/ccShader_PositionTexture.vert 2017-04-21 06:42:23.821811895 -0400 -@@ -23,20 +23,20 @@ - * THE SOFTWARE. - */ - --const char* ccPositionTexture_vert = R"( -+const char* ccPositionTexture_vert = STRINGIFY( - - attribute vec4 a_position; - attribute vec2 a_texCoord; - --#ifdef GL_ES -+\n#ifdef GL_ES\n - varying mediump vec2 v_texCoord; --#else -+\n#else\n - varying vec2 v_texCoord; --#endif -+\n#endif\n - - void main() - { - gl_Position = CC_MVPMatrix * a_position; - v_texCoord = a_texCoord; - } --)"; -\ No newline at end of file -+); -\ No newline at end of file diff --git a/ccShader_PositionTextureA8Color.frag.patch b/ccShader_PositionTextureA8Color.frag.patch deleted file mode 100644 index 1cc6c6f0ab46..000000000000 --- a/ccShader_PositionTextureA8Color.frag.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_PositionTextureA8Color.frag 2017-03-22 15:13:34.000000000 -0400 -+++ /tmp/ccShader_PositionTextureA8Color.frag 2017-04-21 06:42:24.628483573 -0400 -@@ -23,11 +23,11 @@ - * THE SOFTWARE. - */ - --const char* ccPositionTextureA8Color_frag = R"( -+const char* ccPositionTextureA8Color_frag = STRINGIFY( - --#ifdef GL_ES -+\n#ifdef GL_ES\n - precision lowp float; --#endif -+\n#endif\n - - varying vec4 v_fragmentColor; - varying vec2 v_texCoord; -@@ -38,4 +38,4 @@ - v_fragmentColor.a * texture2D(CC_Texture0, v_texCoord).a // A from texture & uniform - ); - } --)"; -+); diff --git a/ccShader_PositionTextureA8Color.vert.patch b/ccShader_PositionTextureA8Color.vert.patch deleted file mode 100644 index e740e8222b4f..000000000000 --- a/ccShader_PositionTextureA8Color.vert.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_PositionTextureA8Color.vert 2017-03-22 15:13:34.000000000 -0400 -+++ /tmp/ccShader_PositionTextureA8Color.vert 2017-04-21 06:42:24.558483138 -0400 -@@ -23,19 +23,19 @@ - * THE SOFTWARE. - */ - --const char* ccPositionTextureA8Color_vert = R"( -+const char* ccPositionTextureA8Color_vert = STRINGIFY( - - attribute vec4 a_position; - attribute vec2 a_texCoord; - attribute vec4 a_color; - --#ifdef GL_ES -+\n#ifdef GL_ES\n - varying lowp vec4 v_fragmentColor; - varying mediump vec2 v_texCoord; --#else -+\n#else\n - varying vec4 v_fragmentColor; - varying vec2 v_texCoord; --#endif -+\n#endif\n - - void main() - { -@@ -43,4 +43,4 @@ - v_fragmentColor = a_color; - v_texCoord = a_texCoord; - } --)"; -+); diff --git a/ccShader_PositionTextureColor.frag.patch b/ccShader_PositionTextureColor.frag.patch deleted file mode 100644 index acc18b6b44b6..000000000000 --- a/ccShader_PositionTextureColor.frag.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_PositionTextureColor.frag 2017-03-22 15:13:34.000000000 -0400 -+++ /tmp/ccShader_PositionTextureColor.frag 2017-04-21 06:42:24.041813262 -0400 -@@ -23,10 +23,10 @@ - * THE SOFTWARE. - */ - --const char* ccPositionTextureColor_frag = R"( --#ifdef GL_ES -+const char* ccPositionTextureColor_frag = STRINGIFY( -+\n#ifdef GL_ES\n - precision lowp float; --#endif -+\n#endif\n - - varying vec4 v_fragmentColor; - varying vec2 v_texCoord; -@@ -35,4 +35,4 @@ - { - gl_FragColor = v_fragmentColor * texture2D(CC_Texture0, v_texCoord); - } --)"; -+); diff --git a/ccShader_PositionTextureColor.vert.patch b/ccShader_PositionTextureColor.vert.patch deleted file mode 100644 index 2b4d046a279e..000000000000 --- a/ccShader_PositionTextureColor.vert.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_PositionTextureColor.vert 2017-03-22 15:13:34.000000000 -0400 -+++ /tmp/ccShader_PositionTextureColor.vert 2017-04-21 06:42:24.428482331 -0400 -@@ -23,18 +23,18 @@ - * THE SOFTWARE. - */ - --const char* ccPositionTextureColor_vert = R"( -+const char* ccPositionTextureColor_vert = STRINGIFY( - attribute vec4 a_position; - attribute vec2 a_texCoord; - attribute vec4 a_color; - --#ifdef GL_ES -+\n#ifdef GL_ES\n - varying lowp vec4 v_fragmentColor; - varying mediump vec2 v_texCoord; --#else -+\n#else\n - varying vec4 v_fragmentColor; - varying vec2 v_texCoord; --#endif -+\n#endif\n - - void main() - { -@@ -42,5 +42,5 @@ - v_fragmentColor = a_color; - v_texCoord = a_texCoord; - } --)"; -+); - diff --git a/ccShader_PositionTextureColorAlphaTest.frag.patch b/ccShader_PositionTextureColorAlphaTest.frag.patch deleted file mode 100644 index 3487e252d0cd..000000000000 --- a/ccShader_PositionTextureColorAlphaTest.frag.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_PositionTextureColorAlphaTest.frag 2017-03-22 15:13:34.000000000 -0400 -+++ /tmp/ccShader_PositionTextureColorAlphaTest.frag 2017-04-21 06:42:24.141813883 -0400 -@@ -22,11 +22,11 @@ - * THE SOFTWARE. - */ - --const char* ccPositionTextureColorAlphaTest_frag = R"( -+const char* ccPositionTextureColorAlphaTest_frag = STRINGIFY( - --#ifdef GL_ES -+\n#ifdef GL_ES\n - precision lowp float; --#endif -+\n#endif\n - - varying vec4 v_fragmentColor; - varying vec2 v_texCoord; -@@ -44,4 +44,4 @@ - - gl_FragColor = texColor * v_fragmentColor; - } --)"; -+); diff --git a/ccShader_PositionTextureColor_noMVP.frag.patch b/ccShader_PositionTextureColor_noMVP.frag.patch deleted file mode 100644 index 598cb37145d2..000000000000 --- a/ccShader_PositionTextureColor_noMVP.frag.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_PositionTextureColor_noMVP.frag 2017-03-22 15:13:34.000000000 -0400 -+++ /tmp/ccShader_PositionTextureColor_noMVP.frag 2017-04-21 06:42:24.301814877 -0400 -@@ -23,10 +23,10 @@ - * THE SOFTWARE. - */ - --const char* ccPositionTextureColor_noMVP_frag = R"( --#ifdef GL_ES -+const char* ccPositionTextureColor_noMVP_frag = STRINGIFY( -+\n#ifdef GL_ES\n - precision lowp float; --#endif -+\n#endif\n - - varying vec4 v_fragmentColor; - varying vec2 v_texCoord; -@@ -35,5 +35,5 @@ - { - gl_FragColor = v_fragmentColor * texture2D(CC_Texture0, v_texCoord); - } --)"; -+); - diff --git a/ccShader_PositionTextureColor_noMVP.vert.patch b/ccShader_PositionTextureColor_noMVP.vert.patch deleted file mode 100644 index f0f3326acbfe..000000000000 --- a/ccShader_PositionTextureColor_noMVP.vert.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_PositionTextureColor_noMVP.vert 2017-03-22 15:13:34.000000000 -0400 -+++ /tmp/ccShader_PositionTextureColor_noMVP.vert 2017-04-21 06:42:23.495143200 -0400 -@@ -23,18 +23,18 @@ - * THE SOFTWARE. - */ - --const char* ccPositionTextureColor_noMVP_vert = R"( -+const char* ccPositionTextureColor_noMVP_vert = STRINGIFY( - attribute vec4 a_position; - attribute vec2 a_texCoord; - attribute vec4 a_color; - --#ifdef GL_ES -+\n#ifdef GL_ES\n - varying lowp vec4 v_fragmentColor; - varying mediump vec2 v_texCoord; --#else -+\n#else\n - varying vec4 v_fragmentColor; - varying vec2 v_texCoord; --#endif -+\n#endif\n - - void main() - { -@@ -42,4 +42,4 @@ - v_fragmentColor = a_color; - v_texCoord = a_texCoord; - } --)"; -+); diff --git a/ccShader_PositionTexture_uColor.frag.patch b/ccShader_PositionTexture_uColor.frag.patch deleted file mode 100644 index 9dda0b234e0c..000000000000 --- a/ccShader_PositionTexture_uColor.frag.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_PositionTexture_uColor.frag 2017-03-22 15:13:34.000000000 -0400 -+++ /tmp/ccShader_PositionTexture_uColor.frag 2017-04-21 06:42:23.788478355 -0400 -@@ -23,11 +23,11 @@ - * THE SOFTWARE. - */ - --const char* ccPositionTexture_uColor_frag = R"( -+const char* ccPositionTexture_uColor_frag = STRINGIFY( - --#ifdef GL_ES -+\n#ifdef GL_ES\n - precision lowp float; --#endif -+\n#endif\n - - uniform vec4 u_color; - -@@ -37,4 +37,4 @@ - { - gl_FragColor = texture2D(CC_Texture0, v_texCoord) * u_color; - } --)"; -+); diff --git a/ccShader_PositionTexture_uColor.vert.patch b/ccShader_PositionTexture_uColor.vert.patch deleted file mode 100644 index 95a4e3b40c81..000000000000 --- a/ccShader_PositionTexture_uColor.vert.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_PositionTexture_uColor.vert 2017-03-22 15:13:34.000000000 -0400 -+++ /tmp/ccShader_PositionTexture_uColor.vert 2017-04-21 06:42:24.111813697 -0400 -@@ -23,20 +23,20 @@ - * THE SOFTWARE. - */ - --const char* ccPositionTexture_uColor_vert = R"( -+const char* ccPositionTexture_uColor_vert = STRINGIFY( - - attribute vec4 a_position; - attribute vec2 a_texCoord; - --#ifdef GL_ES -+\n#ifdef GL_ES\n - varying mediump vec2 v_texCoord; --#else -+\n#else\n - varying vec2 v_texCoord; --#endif -+\n#endif\n - - void main() - { - gl_Position = CC_MVPMatrix * a_position; - v_texCoord = a_texCoord; - } --)"; -+); diff --git a/ccShader_Position_uColor.frag.patch b/ccShader_Position_uColor.frag.patch deleted file mode 100644 index 5a492115d91a..000000000000 --- a/ccShader_Position_uColor.frag.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_Position_uColor.frag 2017-03-22 15:13:34.000000000 -0400 -+++ /tmp/ccShader_Position_uColor.frag 2017-04-21 06:42:24.461815870 -0400 -@@ -23,11 +23,11 @@ - * THE SOFTWARE. - */ - --const char* ccPosition_uColor_frag = R"( -+const char* ccPosition_uColor_frag = STRINGIFY( - --#ifdef GL_ES -+\n#ifdef GL_ES\n - precision lowp float; --#endif -+\n#endif\n - - varying vec4 v_fragmentColor; - -@@ -35,4 +35,4 @@ - { - gl_FragColor = v_fragmentColor; - } --)"; -+); diff --git a/ccShader_Position_uColor.vert.patch b/ccShader_Position_uColor.vert.patch deleted file mode 100644 index 6beaa1662361..000000000000 --- a/ccShader_Position_uColor.vert.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_Position_uColor.vert 2017-03-31 16:21:32.000000000 -0400 -+++ /tmp/ccShader_Position_uColor.vert 2017-04-21 06:42:24.238481150 -0400 -@@ -23,17 +23,17 @@ - * THE SOFTWARE. - */ - --const char* ccPosition_uColor_vert = R"( -+const char* ccPosition_uColor_vert = STRINGIFY( - - attribute vec4 a_position; - uniform vec4 u_color; - uniform float u_pointSize; - --#ifdef GL_ES -+\n#ifdef GL_ES\n - varying lowp vec4 v_fragmentColor; --#else -+\n#else\n - varying vec4 v_fragmentColor; --#endif -+\n#endif\n - - void main() - { -@@ -41,4 +41,4 @@ - gl_PointSize = u_pointSize; - v_fragmentColor = u_color; - } --)"; -+); diff --git a/ccShader_UI_Gray.frag.patch b/ccShader_UI_Gray.frag.patch deleted file mode 100644 index c8c6214ec15d..000000000000 --- a/ccShader_UI_Gray.frag.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_UI_Gray.frag 2017-03-22 15:13:34.000000000 -0400 -+++ /tmp/ccShader_UI_Gray.frag 2017-04-21 06:42:24.595150032 -0400 -@@ -1,8 +1,8 @@ --const char* ccPositionTexture_GrayScale_frag = R"( -+const char* ccPositionTexture_GrayScale_frag = STRINGIFY( - --#ifdef GL_ES -+\n#ifdef GL_ES\n - precision mediump float; --#endif -+\n#endif\n - - varying vec4 v_fragmentColor; - varying vec2 v_texCoord; -@@ -14,4 +14,4 @@ - gl_FragColor.xyz = vec3(0.2126*c.r + 0.7152*c.g + 0.0722*c.b); - gl_FragColor.w = c.w; - } --)"; -+); |