diff options
author | Wilson E. Alvarez | 2017-04-21 07:38:17 -0400 |
---|---|---|
committer | Wilson E. Alvarez | 2017-04-21 07:38:17 -0400 |
commit | d8e7f35d57d791095fbbcff0567165e2ea443266 (patch) | |
tree | 7f546723cc214754bee560615add51200b87c18b | |
parent | 07815f4f1f5aa03b20118a3f8348f471293b6f85 (diff) | |
download | aur-d8e7f35d57d791095fbbcff0567165e2ea443266.tar.gz |
cocos2d-x V3.15
48 files changed, 317 insertions, 283 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Fri Jan 20 18:09:48 UTC 2017 +# Fri Apr 21 11:38:00 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.14.1 - pkgrel = 3 + pkgver = 3.15 + pkgrel = 1 url = http://cdn.cocos2d-x.org/ arch = i686 arch = x86_64 @@ -22,14 +22,13 @@ pkgbase = cocos2d-x-src options = !buildflags options = !strip options = staticlibs - source = http://cdn.cocos2d-x.org/cocos2d-x-3.14.1.zip + source = http://cdn.cocos2d-x.org/cocos2d-x-3.15.zip source = README source = cocos2d-x.sh source = cocos2d-x.csh - source = CMakeLists.patch - source = CCPhysicsBody.patch - source = HelloWorldScene.cpp.patch - source = HelloWorldScene.h.patch + source = CMakeLists.txt.patch + source = CCGLViewImpl-desktop.cpp.patch + source = Cocos2dxActivity.java.patch source = ccShader_3D_Color.frag.patch source = ccShader_3D_ColorNormal.frag.patch source = ccShader_3D_ColorNormalTex.frag.patch @@ -70,56 +69,53 @@ pkgbase = cocos2d-x-src source = ccShader_Position_uColor.frag.patch source = ccShader_Position_uColor.vert.patch source = ccShader_UI_Gray.frag.patch - source = BugsTest.cpp.patch - sha1sums = 66b7a6a93899abbcfc94e22a075c7c286a15135c - sha1sums = 2cff669a51b66d513824be811688aa9da553e400 - sha1sums = 353bdefe07bdb6eb7f53aff20d20e83b488c1c05 - sha1sums = 49b7919fc38803c1dd2f5b1d47fb0c75fde1fec6 - sha1sums = bcad039c11e29d4cbae9e371cb428d52f2eb15ff - sha1sums = 53d64b6246ba32f9f61817f505b30b4d67eeeb44 - sha1sums = 2c6801bae13956394ddcd94080861aac8a25be99 - sha1sums = 0d70b91142ceece19d90a620c707cb5f86f45d32 - sha1sums = 49838c03951aa76524fb651dcb78834393a17682 - sha1sums = de5b8e9c89ead0ecffce6bc1450adf06e5c7e218 - sha1sums = 7ffd26e2235ef54c854b079a0f8b3cd697d8c0d1 - sha1sums = f02f01ec38f0e1a5eb71078a612628c2e11a1413 - sha1sums = 49eeda555783089778035ed124e6759abdea1b62 - sha1sums = c7fe0a570aebe7d4eda2fb263246823265642395 - sha1sums = d45e1c0b739087f9f82d9b1f871403764e4530e4 - sha1sums = 356bca989f7861cff720ecd3a53f52fd1a0315af - sha1sums = fa45ba55634b3af6fae6a1ad6a24abb51343f68b - sha1sums = 7ecd7bf3504f7b90bdaaee4994a44d102884e585 - sha1sums = 91e32c7333705620803b058d9c5efd04d84e17ab - sha1sums = 6dbe3874af5295ccf48c9340be9426ef2e5e3760 - sha1sums = 3e8c0f635f853d56901f625375d02c13458da087 - sha1sums = 92d4fe63b27e5cf90ca1ce44cc25ede1ba94d234 - sha1sums = fca5767e100a3af23eb65f731c93f415d69dcb05 - sha1sums = 4d971dd9f306f1ffad5f6203ecb8b1074543f926 - sha1sums = 32fe66982514e9e3b5743c31673990d0d5c39d4f - sha1sums = e08916384e815c551fb06c409ecb8a796b0eaf2d - sha1sums = f09d34eba8ee67eb4a003829b6a3e5c7abcdd682 - sha1sums = c16f73e553d373aa5a6c64bc2a7a64273ca073c6 - sha1sums = 52c7eb7fd0bb5c436578d6ba11359b0dd5f54ff0 - sha1sums = 4b7925d294703e718e8627d807ed0f356b4828f0 - sha1sums = a2ff2f92cf8a535e37b64278161fd1ce3d679588 - sha1sums = c388ab06b5639d9fd5d179990cf03dabb470b356 - sha1sums = 1d7dc7ea26aa75750e883ec31fbbb1b9c54d6174 - sha1sums = 2a08b8532a42bb7fd647c3e01b803516430ad327 - sha1sums = 02e5f3695ead2d34d7ad4013b2246cddbfbed863 - sha1sums = f83994a7da0311c193f3b3578ac59dc83d9f9700 - sha1sums = 4c1b8cd3779ffea607ffff6b59e272b938b6acd4 - sha1sums = eae2679bc313b4368bfbf180f98985df71a9b3f9 - sha1sums = 6837a4bb47269a17bdb498072670abcd5f437388 - sha1sums = 4f93f13d4b8c6369fe97f94bed50e5d9649a7eda - sha1sums = 64b951ec9c2453fca2348a8a2bde483ada4a11f7 - sha1sums = 43bbb35ed1e1c28f14a4ea333c463b87641e8238 - sha1sums = 399ffc785562ee9ce25fb4b3dadb96fcc70bcfc6 - sha1sums = 4d65c632745df2772f7c2c9507ba8bc228865c97 - sha1sums = 166a5e48711c6c8f329af275e4a6e0a0203052df - sha1sums = d8e81b49baec4fd9e04822e1c460dd43f85762bb - sha1sums = ea81b894221a8cf42bd6eecd1ced44fff27ad5f4 - sha1sums = c8caec1e9626d222c67a7c883c8cb94101799956 - sha1sums = d324bb51453ecdadede650a34d66e966e0356523 + sha256sums = 5296091bf87d894475d2bbde39d2081612aea9ee855a91968e7523fbc6c84a5f + sha256sums = 09248ad9af9a94579b56c7c7dbf1b4276a59852c90423ad70c48b16355f28574 + sha256sums = f2f74a36538c43045894bd2b2415a2396bcb5c28f9241296b0e6d39a452b56b1 + sha256sums = 3a7ae492fe9b2d7db8ef15c2d47e147746823942943e099d5a494c7076b2e92b + sha256sums = 9a5a73ed7a1fc0cc152b0d27878b973abd525dd1a5906757d6dd385178f69835 + sha256sums = 3cc0e9666eeed8c0b4f7a8d0edfe1e5245c1cca53ca7e4a150660dc1bbf2a299 + sha256sums = b2575e466cbba3d1abf3f467b0ea4505a00c3645de5ee8f8908b693d708b3c67 + sha256sums = 3f697c60080e85940a623a358a6d13ccab8a8f87346521c210196cc8ee48dcac + sha256sums = e8418d25047914058adbddce65b5f9ca7abd88bf45a1e063d8eb69aa997d4a9c + sha256sums = 13de90070e6242d299232778f8a9d41c22c92d518e3a38e32501577826f52149 + sha256sums = 0efc1d771e2b6a5bbca414732317e709c82a53878a0431c64aa2279b9f4321fe + sha256sums = 70351ae2d5a53fd42c96d5702efcef48d15a71ed7c4e55911c9678cfca7c4ab6 + sha256sums = f956e3b937c663a159a6c7bc92d5c951fd18836113dcc125bb0fe46147e62531 + sha256sums = 3fb4eb3b15dd0f28e8d171719c779d9680329126ae6cc56ce10d0d3784b0aa15 + sha256sums = 79b79366bc2690a01128fbfd0742f58ccf8f9f2ca1d7dd0a4b73d47c096ee7f6 + sha256sums = b8292b1c7971c285a7732e39b492f919df985c35a982a30bd9f004e9cd07f2fb + sha256sums = 572d86d285fa1bb6b72aa6d012244adfe3f3a304b66764fd555997dc8462baf4 + sha256sums = c56d1402ddfa5a7c5607a23b44768880797f84bc1081cbf773fa457be5b2be0a + sha256sums = c7101ce86d01afa4c20efb4f89dd3e2b6d85059df233e57539648922c3eaca8f + sha256sums = 898e63f7352513848213e8fa929364acbd85707c9bbf054250c253499b65b4b7 + sha256sums = 9b7f760d99844b456a2f56e2a875e5355a7766537b4d2b33970d5d66bb397e3e + sha256sums = 4b588741894aec0b2da47a35ff39787458202a431b88f0af6e422fcb4ee34709 + sha256sums = 485ea7adc13632762aa78758c96287cc41f85a2d3edf2ab9e7b299883db52c9b + sha256sums = bdd4bb3218853c9f0a7675d3d98a50e5e1d6b69b1b3861255bf0f497782d8954 + sha256sums = e847773c38ef54d23b6f3fefbf9b717ca187a2780cd2b3d020f0eeb3b4a94971 + sha256sums = 62db6b5d01b14d8f4322a8e32cd7257ca8b87b6d55aa9a18418bc90d85ccfc89 + sha256sums = 8437d3cf0d8ae3af545917095cf236b93fa0c2c480062cfefd786bfa2db5c209 + sha256sums = 2a7e2557b1d7d85405b1a8337a876d2633921dccdfef8d5a34fb13f923b0ffd2 + sha256sums = 5a7b57272514d4204fea0944151ab9eb23d533b1a97c289e408269eb2d877728 + sha256sums = ef4fd5d339ed872d41848847596a49a79f6a5d26c46a7edce8aadf2a9764e53a + sha256sums = b2e422006a7f5348f3833d28b17a44ab1c4afd9daaeed65d4505bbedf0647eff + sha256sums = dcb815b3c7a8e431fb8678701785d8cfb6568dc0976b86ab43c824fce765338c + sha256sums = e962c317447119b2730103ddb9cddad5f366c614cab05249a5b52a92d14d0147 + sha256sums = 7b33a4d78fa89b8b6a8fe3317dbf2e93e72f4579b9bedcefa1d4ac5daa5e4872 + sha256sums = 39bb1106c7df3a2958589b5ae5cdbbf9afd1b381951791761372424c28e4dd4e + sha256sums = 308fa40e69de2c5cfa79e65edc326323bd80e26eb9da539d84ffeddf4e913017 + sha256sums = ffd5fb98cc4f6edfdda8a2e807ce97351fca6bf2dfd9570e158da797fc6b1245 + sha256sums = de468779316ec6438fde600328aa648c7904db0dc3c918535efd59e67d410013 + sha256sums = 120250a97af3be476df8dcac1472538c8a11d1ae9ab0624ddae8261b539695a8 + sha256sums = eb2bee833918146282c2e9df02b3b021c5e95f0014d3eaa7df8da20ba3df7403 + sha256sums = 07d8dbc9dd529b04341bdd4dc047eafb6674f2413d54baa6450f9b7dce78ae53 + sha256sums = ed7882c39f4074cc71d3498a4825b0e20ee895bc926419fda30ad8de1a2eaa43 + sha256sums = 35d5761e0005d8a583692a9c44517d956c9ae41da9c1cc69e05ce42d425e26fa + sha256sums = afe36a4cd2347c33c6c610b15966c1c4072d813a1b8a7ddcf611f3b8c0d08836 + sha256sums = db37cb1c64fc1990e26da2cc1d7a7756d50c2059a24c5d0d29757275850ace4d + sha256sums = 5394b03f78a25d6736171c792b384b6abdb20e80647cbf5220c55729eb9a2650 + sha256sums = c4cb76c3d896e66391453173f30417f8646257c1d702ee5a3cb3e4980f3df000 pkgname = cocos2d-x-src diff --git a/BugsTest.cpp.patch b/BugsTest.cpp.patch deleted file mode 100644 index b715769a508b..000000000000 --- a/BugsTest.cpp.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- /opt/cocos2d-x/tests/cpp-tests/Classes/BugsTest/BugsTest.cpp 2016-11-29 17:15:20.000000000 -0400 -+++ /opt/cocos2d-x-git/tests/cpp-tests/Classes/BugsTest/BugsTest.cpp 2017-01-09 22:34:30.318010945 -0400 -@@ -34,7 +34,9 @@ - ADD_TEST_CASE(BugDrawNodeLayer); - ADD_TEST_CASE(Bug12847Layer); - ADD_TEST_CASE(Bug15594Layer); -- ADD_TEST_CASE(Bug15776Layer); -+ -+ // NOTE: comment this out because it currently crashes during autotest -+ //ADD_TEST_CASE(Bug15776Layer); - - #if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) - ADD_TEST_CASE(Bug14327Layer); diff --git a/CCGLViewImpl-desktop.cpp.patch b/CCGLViewImpl-desktop.cpp.patch new file mode 100644 index 000000000000..45ad7d12b0fd --- /dev/null +++ b/CCGLViewImpl-desktop.cpp.patch @@ -0,0 +1,11 @@ +@@ -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/CMakeLists.txt.patch b/CMakeLists.txt.patch new file mode 100644 index 000000000000..9b6dc640f8b4 --- /dev/null +++ b/CMakeLists.txt.patch @@ -0,0 +1,26 @@ +--- /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 new file mode 100644 index 000000000000..856d54ed1d4b --- /dev/null +++ b/Cocos2dxActivity.java.patch @@ -0,0 +1,11 @@ +--- /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 + }; diff --git a/HelloWorldScene.cpp.patch b/HelloWorldScene.cpp.patch deleted file mode 100644 index 4ab4c048a583..000000000000 --- a/HelloWorldScene.cpp.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- HelloWorldScene.cpp 2016-12-21 13:43:14.000000000 -0400 -+++ /opt/cocos2d-x-git/templates/cpp-template-default/Classes/HelloWorldScene.cpp 2017-01-04 12:22:47.004282988 -0400 -@@ -5,17 +5,7 @@ - - Scene* HelloWorld::createScene() - { -- // 'scene' is an autorelease object -- auto scene = Scene::create(); -- -- // 'layer' is an autorelease object -- auto layer = HelloWorld::create(); -- -- // add layer as a child to scene -- scene->addChild(layer); -- -- // return the scene -- return scene; -+ return HelloWorld::create(); - } - - // on "init" you need to initialize your instance -@@ -23,7 +13,7 @@ - { - ////////////////////////////// - // 1. super init first -- if ( !Layer::init() ) -+ if ( !Scene::init() ) - { - return false; - } diff --git a/HelloWorldScene.h.patch b/HelloWorldScene.h.patch deleted file mode 100644 index a79adb2f25c9..000000000000 --- a/HelloWorldScene.h.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- HelloWorldScene.h 2016-12-21 13:43:14.000000000 -0400 -+++ /opt/cocos2d-x-git/templates/cpp-template-default/Classes/HelloWorldScene.h 2017-01-04 12:22:47.004282988 -0400 -@@ -3,7 +3,7 @@ - - #include "cocos2d.h" - --class HelloWorld : public cocos2d::Layer -+class HelloWorld : public cocos2d::Scene - { - public: - static cocos2d::Scene* createScene(); @@ -1,10 +1,10 @@ # Mantainer: Wilson E. Alvarez <wilson.e.alvarez1@gmail.com> -# Submitter: Samuel FORGIONE <samuel.forgione@gmail.com> +# Previous Maintainer: Samuel FORGIONE <samuel.forgione@gmail.com> _appname=cocos2d-x pkgname=cocos2d-x-src -pkgver=3.14.1 -pkgrel=3 +pkgver=3.15 +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/" @@ -17,10 +17,9 @@ source=( "README" "$_appname.sh" "$_appname.csh" -"CMakeLists.patch" -"CCPhysicsBody.patch" -"HelloWorldScene.cpp.patch" -"HelloWorldScene.h.patch" +"CMakeLists.txt.patch" +"CCGLViewImpl-desktop.cpp.patch" +"Cocos2dxActivity.java.patch" "ccShader_3D_Color.frag.patch" "ccShader_3D_ColorNormal.frag.patch" "ccShader_3D_ColorNormalTex.frag.patch" @@ -61,58 +60,55 @@ source=( "ccShader_Position_uColor.frag.patch" "ccShader_Position_uColor.vert.patch" "ccShader_UI_Gray.frag.patch" -"BugsTest.cpp.patch" ) -sha1sums=( -'66b7a6a93899abbcfc94e22a075c7c286a15135c' -'2cff669a51b66d513824be811688aa9da553e400' -'353bdefe07bdb6eb7f53aff20d20e83b488c1c05' -'49b7919fc38803c1dd2f5b1d47fb0c75fde1fec6' -'bcad039c11e29d4cbae9e371cb428d52f2eb15ff' -'53d64b6246ba32f9f61817f505b30b4d67eeeb44' -'2c6801bae13956394ddcd94080861aac8a25be99' -'0d70b91142ceece19d90a620c707cb5f86f45d32' -'49838c03951aa76524fb651dcb78834393a17682' -'de5b8e9c89ead0ecffce6bc1450adf06e5c7e218' -'7ffd26e2235ef54c854b079a0f8b3cd697d8c0d1' -'f02f01ec38f0e1a5eb71078a612628c2e11a1413' -'49eeda555783089778035ed124e6759abdea1b62' -'c7fe0a570aebe7d4eda2fb263246823265642395' -'d45e1c0b739087f9f82d9b1f871403764e4530e4' -'356bca989f7861cff720ecd3a53f52fd1a0315af' -'fa45ba55634b3af6fae6a1ad6a24abb51343f68b' -'7ecd7bf3504f7b90bdaaee4994a44d102884e585' -'91e32c7333705620803b058d9c5efd04d84e17ab' -'6dbe3874af5295ccf48c9340be9426ef2e5e3760' -'3e8c0f635f853d56901f625375d02c13458da087' -'92d4fe63b27e5cf90ca1ce44cc25ede1ba94d234' -'fca5767e100a3af23eb65f731c93f415d69dcb05' -'4d971dd9f306f1ffad5f6203ecb8b1074543f926' -'32fe66982514e9e3b5743c31673990d0d5c39d4f' -'e08916384e815c551fb06c409ecb8a796b0eaf2d' -'f09d34eba8ee67eb4a003829b6a3e5c7abcdd682' -'c16f73e553d373aa5a6c64bc2a7a64273ca073c6' -'52c7eb7fd0bb5c436578d6ba11359b0dd5f54ff0' -'4b7925d294703e718e8627d807ed0f356b4828f0' -'a2ff2f92cf8a535e37b64278161fd1ce3d679588' -'c388ab06b5639d9fd5d179990cf03dabb470b356' -'1d7dc7ea26aa75750e883ec31fbbb1b9c54d6174' -'2a08b8532a42bb7fd647c3e01b803516430ad327' -'02e5f3695ead2d34d7ad4013b2246cddbfbed863' -'f83994a7da0311c193f3b3578ac59dc83d9f9700' -'4c1b8cd3779ffea607ffff6b59e272b938b6acd4' -'eae2679bc313b4368bfbf180f98985df71a9b3f9' -'6837a4bb47269a17bdb498072670abcd5f437388' -'4f93f13d4b8c6369fe97f94bed50e5d9649a7eda' -'64b951ec9c2453fca2348a8a2bde483ada4a11f7' -'43bbb35ed1e1c28f14a4ea333c463b87641e8238' -'399ffc785562ee9ce25fb4b3dadb96fcc70bcfc6' -'4d65c632745df2772f7c2c9507ba8bc228865c97' -'166a5e48711c6c8f329af275e4a6e0a0203052df' -'d8e81b49baec4fd9e04822e1c460dd43f85762bb' -'ea81b894221a8cf42bd6eecd1ced44fff27ad5f4' -'c8caec1e9626d222c67a7c883c8cb94101799956' -'d324bb51453ecdadede650a34d66e966e0356523' +sha256sums=( +'5296091bf87d894475d2bbde39d2081612aea9ee855a91968e7523fbc6c84a5f' +'09248ad9af9a94579b56c7c7dbf1b4276a59852c90423ad70c48b16355f28574' +'f2f74a36538c43045894bd2b2415a2396bcb5c28f9241296b0e6d39a452b56b1' +'3a7ae492fe9b2d7db8ef15c2d47e147746823942943e099d5a494c7076b2e92b' +'9a5a73ed7a1fc0cc152b0d27878b973abd525dd1a5906757d6dd385178f69835' +'3cc0e9666eeed8c0b4f7a8d0edfe1e5245c1cca53ca7e4a150660dc1bbf2a299' +'b2575e466cbba3d1abf3f467b0ea4505a00c3645de5ee8f8908b693d708b3c67' +'3f697c60080e85940a623a358a6d13ccab8a8f87346521c210196cc8ee48dcac' +'e8418d25047914058adbddce65b5f9ca7abd88bf45a1e063d8eb69aa997d4a9c' +'13de90070e6242d299232778f8a9d41c22c92d518e3a38e32501577826f52149' +'0efc1d771e2b6a5bbca414732317e709c82a53878a0431c64aa2279b9f4321fe' +'70351ae2d5a53fd42c96d5702efcef48d15a71ed7c4e55911c9678cfca7c4ab6' +'f956e3b937c663a159a6c7bc92d5c951fd18836113dcc125bb0fe46147e62531' +'3fb4eb3b15dd0f28e8d171719c779d9680329126ae6cc56ce10d0d3784b0aa15' +'79b79366bc2690a01128fbfd0742f58ccf8f9f2ca1d7dd0a4b73d47c096ee7f6' +'b8292b1c7971c285a7732e39b492f919df985c35a982a30bd9f004e9cd07f2fb' +'572d86d285fa1bb6b72aa6d012244adfe3f3a304b66764fd555997dc8462baf4' +'c56d1402ddfa5a7c5607a23b44768880797f84bc1081cbf773fa457be5b2be0a' +'c7101ce86d01afa4c20efb4f89dd3e2b6d85059df233e57539648922c3eaca8f' +'898e63f7352513848213e8fa929364acbd85707c9bbf054250c253499b65b4b7' +'9b7f760d99844b456a2f56e2a875e5355a7766537b4d2b33970d5d66bb397e3e' +'4b588741894aec0b2da47a35ff39787458202a431b88f0af6e422fcb4ee34709' +'485ea7adc13632762aa78758c96287cc41f85a2d3edf2ab9e7b299883db52c9b' +'bdd4bb3218853c9f0a7675d3d98a50e5e1d6b69b1b3861255bf0f497782d8954' +'e847773c38ef54d23b6f3fefbf9b717ca187a2780cd2b3d020f0eeb3b4a94971' +'62db6b5d01b14d8f4322a8e32cd7257ca8b87b6d55aa9a18418bc90d85ccfc89' +'8437d3cf0d8ae3af545917095cf236b93fa0c2c480062cfefd786bfa2db5c209' +'2a7e2557b1d7d85405b1a8337a876d2633921dccdfef8d5a34fb13f923b0ffd2' +'5a7b57272514d4204fea0944151ab9eb23d533b1a97c289e408269eb2d877728' +'ef4fd5d339ed872d41848847596a49a79f6a5d26c46a7edce8aadf2a9764e53a' +'b2e422006a7f5348f3833d28b17a44ab1c4afd9daaeed65d4505bbedf0647eff' +'dcb815b3c7a8e431fb8678701785d8cfb6568dc0976b86ab43c824fce765338c' +'e962c317447119b2730103ddb9cddad5f366c614cab05249a5b52a92d14d0147' +'7b33a4d78fa89b8b6a8fe3317dbf2e93e72f4579b9bedcefa1d4ac5daa5e4872' +'39bb1106c7df3a2958589b5ae5cdbbf9afd1b381951791761372424c28e4dd4e' +'308fa40e69de2c5cfa79e65edc326323bd80e26eb9da539d84ffeddf4e913017' +'ffd5fb98cc4f6edfdda8a2e807ce97351fca6bf2dfd9570e158da797fc6b1245' +'de468779316ec6438fde600328aa648c7904db0dc3c918535efd59e67d410013' +'120250a97af3be476df8dcac1472538c8a11d1ae9ab0624ddae8261b539695a8' +'eb2bee833918146282c2e9df02b3b021c5e95f0014d3eaa7df8da20ba3df7403' +'07d8dbc9dd529b04341bdd4dc047eafb6674f2413d54baa6450f9b7dce78ae53' +'ed7882c39f4074cc71d3498a4825b0e20ee895bc926419fda30ad8de1a2eaa43' +'35d5761e0005d8a583692a9c44517d956c9ae41da9c1cc69e05ce42d425e26fa' +'afe36a4cd2347c33c6c610b15966c1c4072d813a1b8a7ddcf611f3b8c0d08836' +'db37cb1c64fc1990e26da2cc1d7a7756d50c2059a24c5d0d29757275850ace4d' +'5394b03f78a25d6736171c792b384b6abdb20e80647cbf5220c55729eb9a2650' +'c4cb76c3d896e66391453173f30417f8646257c1d702ee5a3cb3e4980f3df000' ) @@ -124,24 +120,42 @@ prepare() { 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" - # Make sure COCOS2D_DEBUG spans libcocos2d correctly: https://github.com/cocos2d/cocos2d-x/pull/17033 - patch -s "$srcdir"/$_appname-$pkgver/templates/cpp-template-default/CMakeLists.txt CMakeLists.patch + ## ===============PATCHES BEGIN======================= + + ## Performance tweaks + + ## Add CMake configuration flags to ease the configuratino of libcocos2d: + patch -s "$srcdir"/$_appname-$pkgver/templates/cpp-template-default/CMakeLists.txt CMakeLists.txt.patch - # Layer has been deprecated. Update the C++ templates: https://github.com/cocos2d/cocos2d-x/pull/17048 - patch -s "$srcdir"/$_appname-$pkgver/templates/cpp-template-default/Classes/HelloWorldScene.cpp HelloWorldScene.cpp.patch - patch -s "$srcdir"/$_appname-$pkgver/templates/cpp-template-default/Classes/HelloWorldScene.h HelloWorldScene.h.patch + # TODO: Also add the following options to the CMakeLists.txt patch for disabling/enabling libraries + # Uncomment to disable compiling/linking the following: + #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") + #set(USE_SOURCES_EXTERNAL OFF CACHE BOOL "Use sources in external directory (automatically ON when USE_PREBUILT_LIBS is)") - # Allow Chipmunk's kinematic bodies to be moved: https://github.com/cocos2d/cocos2d-x/pull/17033 - patch -s "$srcdir"/$_appname-$pkgver/cocos/physics/CCPhysicsBody.cpp CCPhysicsBody.patch + # POSSIBLE FUTURE TODO: There is a memory leak patch currently out for Labels. Stay tuned to see if it's affected: https://github.com/cocos2d/cocos2d-x/pull/17670 # 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_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 @@ -157,40 +171,64 @@ package() { 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_df.frag ccShader_Label_df.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_Label.vert ccShader_Label.vert.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_PositionColor.vert ccShader_PositionColor.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_PositionTextureColorAlphaTest.frag ccShader_PositionTextureColorAlphaTest.frag.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_PositionTextureColor.vert ccShader_PositionTextureColor.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_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_PositionTexture.vert ccShader_PositionTexture.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 + 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..." + # For Android + patch -s "$srcdir"/$_appname-$pkgver/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxActivity.java Cocos2dxActivity.java.patch - # Patch BugTests.cpp to avoid a non-bug crash. See https://github.com/cocos2d/cocos2d-x/pull/17125 - patch -s "$srcdir"/$_appname-$pkgver/tests/cpp-tests/Classes/BugsTest/BugsTest.cpp BugsTest.cpp.patch + # For Linux, Mac and Windows: + patch -s "$srcdir"/$_appname-$pkgver/cocos/platform/desktop/CCGLViewImpl-desktop.cpp CCGLViewImpl-desktop.cpp.patch - # (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 - #sed -i 's/mediump/highp/g' "$srcdir"/$_appname-$pkgver/cocos/renderer/* + #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" diff --git a/ccShader_3D_Color.frag.patch b/ccShader_3D_Color.frag.patch index 4ef0621f899e..9e5297deb968 100644 --- a/ccShader_3D_Color.frag.patch +++ b/ccShader_3D_Color.frag.patch @@ -1,5 +1,5 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_3D_Color.frag 2016-12-29 13:42:38.000000000 -0400 -+++ /tmp/ccShader_3D_Color.frag 2017-01-04 15:03:03.130124792 -0400 +--- /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"( diff --git a/ccShader_3D_ColorNormal.frag.patch b/ccShader_3D_ColorNormal.frag.patch index ee1e2a47fecd..db928740549b 100644 --- a/ccShader_3D_ColorNormal.frag.patch +++ b/ccShader_3D_ColorNormal.frag.patch @@ -1,5 +1,5 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_3D_ColorNormal.frag 2016-12-29 13:42:38.000000000 -0400 -+++ /tmp/ccShader_3D_ColorNormal.frag 2017-01-04 15:03:03.186784936 -0400 +--- /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"( diff --git a/ccShader_3D_ColorNormalTex.frag.patch b/ccShader_3D_ColorNormalTex.frag.patch index b2756784fd4d..485e97e06872 100644 --- a/ccShader_3D_ColorNormalTex.frag.patch +++ b/ccShader_3D_ColorNormalTex.frag.patch @@ -1,5 +1,5 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_3D_ColorNormalTex.frag 2016-12-29 13:42:38.000000000 -0400 -+++ /tmp/ccShader_3D_ColorNormalTex.frag 2017-01-04 15:03:03.246778028 -0400 +--- /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"( diff --git a/ccShader_3D_ColorTex.frag.patch b/ccShader_3D_ColorTex.frag.patch index 5142b3f2b658..77947cb7c2bf 100644 --- a/ccShader_3D_ColorTex.frag.patch +++ b/ccShader_3D_ColorTex.frag.patch @@ -1,5 +1,5 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_3D_ColorTex.frag 2016-12-29 13:42:38.000000000 -0400 -+++ /tmp/ccShader_3D_ColorTex.frag 2017-01-04 15:03:03.303438172 -0400 +--- /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"( diff --git a/ccShader_3D_Particle.frag.patch b/ccShader_3D_Particle.frag.patch index 1ff9d19874f7..ece1880a7395 100644 --- a/ccShader_3D_Particle.frag.patch +++ b/ccShader_3D_Particle.frag.patch @@ -1,5 +1,5 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_3D_Particle.frag 2016-12-29 13:42:38.000000000 -0400 -+++ /tmp/ccShader_3D_Particle.frag 2017-01-04 15:03:03.356765365 -0400 +--- /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"( diff --git a/ccShader_3D_Particle.vert.patch b/ccShader_3D_Particle.vert.patch index d606bdfbfd17..7b0d25e5da45 100644 --- a/ccShader_3D_Particle.vert.patch +++ b/ccShader_3D_Particle.vert.patch @@ -1,5 +1,5 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_3D_Particle.vert 2016-12-29 13:42:38.000000000 -0400 -+++ /tmp/ccShader_3D_Particle.vert 2017-01-04 15:03:03.413425508 -0400 +--- /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"( diff --git a/ccShader_3D_PositionNormalTex.vert.patch b/ccShader_3D_PositionNormalTex.vert.patch index 2b111b205acb..3437654346de 100644 --- a/ccShader_3D_PositionNormalTex.vert.patch +++ b/ccShader_3D_PositionNormalTex.vert.patch @@ -1,5 +1,5 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_3D_PositionNormalTex.vert 2016-12-29 13:42:38.000000000 -0400 -+++ /tmp/ccShader_3D_PositionNormalTex.vert 2017-01-04 15:03:03.470085652 -0400 +--- /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"( diff --git a/ccShader_3D_PositionTex.vert.patch b/ccShader_3D_PositionTex.vert.patch index 042a58faf4b7..d2947ac38689 100644 --- a/ccShader_3D_PositionTex.vert.patch +++ b/ccShader_3D_PositionTex.vert.patch @@ -1,5 +1,5 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_3D_PositionTex.vert 2016-12-29 13:42:38.000000000 -0400 -+++ /tmp/ccShader_3D_PositionTex.vert 2017-01-04 15:03:03.530078745 -0400 +--- /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"( diff --git a/ccShader_3D_Skybox.frag.patch b/ccShader_3D_Skybox.frag.patch index 44116ce7aba5..e1daffa3c0fe 100644 --- a/ccShader_3D_Skybox.frag.patch +++ b/ccShader_3D_Skybox.frag.patch @@ -1,5 +1,5 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_3D_Skybox.frag 2016-12-29 13:42:38.000000000 -0400 -+++ /tmp/ccShader_3D_Skybox.frag 2017-01-04 15:03:03.586738888 -0400 +--- /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 diff --git a/ccShader_3D_Skybox.vert.patch b/ccShader_3D_Skybox.vert.patch index 8a3d260dcda1..3b67a93ee6e7 100644 --- a/ccShader_3D_Skybox.vert.patch +++ b/ccShader_3D_Skybox.vert.patch @@ -1,5 +1,5 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_3D_Skybox.vert 2016-12-29 13:42:38.000000000 -0400 -+++ /tmp/ccShader_3D_Skybox.vert 2017-01-04 15:03:03.633400183 -0400 +--- /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( diff --git a/ccShader_3D_Terrain.frag.patch b/ccShader_3D_Terrain.frag.patch index 1fed1a335cf7..c9790afc1acd 100644 --- a/ccShader_3D_Terrain.frag.patch +++ b/ccShader_3D_Terrain.frag.patch @@ -1,5 +1,5 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_3D_Terrain.frag 2016-12-29 13:42:38.000000000 -0400 -+++ /tmp/ccShader_3D_Terrain.frag 2017-01-04 15:03:03.693393276 -0400 +--- /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"( diff --git a/ccShader_3D_Terrain.vert.patch b/ccShader_3D_Terrain.vert.patch index 138ac0ae5285..0cd522a4a710 100644 --- a/ccShader_3D_Terrain.vert.patch +++ b/ccShader_3D_Terrain.vert.patch @@ -1,5 +1,5 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_3D_Terrain.vert 2016-12-29 13:42:38.000000000 -0400 -+++ /tmp/ccShader_3D_Terrain.vert 2017-01-04 15:03:03.753386368 -0400 +--- /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"( diff --git a/ccShader_CameraClear.frag.patch b/ccShader_CameraClear.frag.patch index 98eca0e85e3d..a17c6642876b 100644 --- a/ccShader_CameraClear.frag.patch +++ b/ccShader_CameraClear.frag.patch @@ -1,5 +1,5 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_CameraClear.frag 2016-12-29 13:42:38.000000000 -0400 -+++ /tmp/ccShader_CameraClear.frag 2017-01-04 15:03:03.806713562 -0400 +--- /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"( diff --git a/ccShader_CameraClear.vert.patch b/ccShader_CameraClear.vert.patch index 01ebec8aecc9..6699ceefb436 100644 --- a/ccShader_CameraClear.vert.patch +++ b/ccShader_CameraClear.vert.patch @@ -1,5 +1,5 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_CameraClear.vert 2016-12-29 13:42:38.000000000 -0400 -+++ /tmp/ccShader_CameraClear.vert 2017-01-04 15:03:03.856707806 -0400 +--- /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"( diff --git a/ccShader_ETC1AS_PositionTextureColor.frag.patch b/ccShader_ETC1AS_PositionTextureColor.frag.patch index 26985699a2e9..bd824e380b8a 100644 --- a/ccShader_ETC1AS_PositionTextureColor.frag.patch +++ b/ccShader_ETC1AS_PositionTextureColor.frag.patch @@ -1,5 +1,5 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_ETC1AS_PositionTextureColor.frag 2016-12-29 13:42:38.000000000 -0400 -+++ /tmp/ccShader_ETC1AS_PositionTextureColor.frag 2017-01-04 15:03:03.913367949 -0400 +--- /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. */ diff --git a/ccShader_ETC1AS_PositionTextureGray.frag.patch b/ccShader_ETC1AS_PositionTextureGray.frag.patch index 15769fa04468..ce1e86420a42 100644 --- a/ccShader_ETC1AS_PositionTextureGray.frag.patch +++ b/ccShader_ETC1AS_PositionTextureGray.frag.patch @@ -1,5 +1,5 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_ETC1AS_PositionTextureGray.frag 2016-12-29 13:42:38.000000000 -0400 -+++ /tmp/ccShader_ETC1AS_PositionTextureGray.frag 2017-01-04 15:03:03.963362193 -0400 +--- /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. */ diff --git a/ccShader_Label.vert.patch b/ccShader_Label.vert.patch index abce62403bce..2a1f5c5a36ca 100644 --- a/ccShader_Label.vert.patch +++ b/ccShader_Label.vert.patch @@ -1,5 +1,5 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_Label.vert 2016-12-29 13:42:38.000000000 -0400 -+++ /tmp/ccShader_Label.vert 2017-01-04 15:03:04.016689390 -0400 +--- /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. */ diff --git a/ccShader_Label_df.frag.patch b/ccShader_Label_df.frag.patch index 295ce593d6cb..1390f21e6637 100644 --- a/ccShader_Label_df.frag.patch +++ b/ccShader_Label_df.frag.patch @@ -1,5 +1,5 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_Label_df.frag 2016-12-29 13:42:38.000000000 -0400 -+++ /tmp/ccShader_Label_df.frag 2017-01-04 15:03:04.066683647 -0400 +--- /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( diff --git a/ccShader_Label_df_glow.frag.patch b/ccShader_Label_df_glow.frag.patch index dfc6919364d9..579dbc7068aa 100644 --- a/ccShader_Label_df_glow.frag.patch +++ b/ccShader_Label_df_glow.frag.patch @@ -1,5 +1,5 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_Label_df_glow.frag 2016-12-29 13:42:38.000000000 -0400 -+++ /tmp/ccShader_Label_df_glow.frag 2017-01-04 15:03:04.120010854 -0400 +--- /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( diff --git a/ccShader_Label_normal.frag.patch b/ccShader_Label_normal.frag.patch index b4a3a8395e74..46d7a7fade11 100644 --- a/ccShader_Label_normal.frag.patch +++ b/ccShader_Label_normal.frag.patch @@ -1,5 +1,5 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_Label_normal.frag 2016-12-29 13:42:38.000000000 -0400 -+++ /tmp/ccShader_Label_normal.frag 2017-01-04 15:03:04.176671012 -0400 +--- /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. */ diff --git a/ccShader_Label_outline.frag.patch b/ccShader_Label_outline.frag.patch index e846987d2713..4a8efc05d99e 100644 --- a/ccShader_Label_outline.frag.patch +++ b/ccShader_Label_outline.frag.patch @@ -1,5 +1,5 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_Label_outline.frag 2016-12-29 13:42:38.000000000 -0400 -+++ /tmp/ccShader_Label_outline.frag 2017-01-04 15:03:04.226665269 -0400 +--- /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 ??? diff --git a/ccShader_PositionColor.frag.patch b/ccShader_PositionColor.frag.patch index 5af1bbcbb71f..a1a3a59e1b51 100644 --- a/ccShader_PositionColor.frag.patch +++ b/ccShader_PositionColor.frag.patch @@ -1,5 +1,5 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_PositionColor.frag 2016-12-29 13:42:38.000000000 -0400 -+++ /tmp/ccShader_PositionColor.frag 2017-01-04 15:03:04.283325426 -0400 +--- /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. */ diff --git a/ccShader_PositionColor.vert.patch b/ccShader_PositionColor.vert.patch index ff68c20c7b0b..a229d6090458 100644 --- a/ccShader_PositionColor.vert.patch +++ b/ccShader_PositionColor.vert.patch @@ -1,5 +1,5 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_PositionColor.vert 2016-12-29 13:42:38.000000000 -0400 -+++ /tmp/ccShader_PositionColor.vert 2017-01-04 15:03:04.323320831 -0400 +--- /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. */ diff --git a/ccShader_PositionColorLengthTexture.frag.patch b/ccShader_PositionColorLengthTexture.frag.patch index 0e81e418f36e..8b365781a2d0 100644 --- a/ccShader_PositionColorLengthTexture.frag.patch +++ b/ccShader_PositionColorLengthTexture.frag.patch @@ -1,5 +1,5 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_PositionColorLengthTexture.frag 2016-12-29 13:42:38.000000000 -0400 -+++ /tmp/ccShader_PositionColorLengthTexture.frag 2017-01-04 15:03:04.383313940 -0400 +--- /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. */ diff --git a/ccShader_PositionColorLengthTexture.vert.patch b/ccShader_PositionColorLengthTexture.vert.patch index af4244e5bf2f..285f03b058fb 100644 --- a/ccShader_PositionColorLengthTexture.vert.patch +++ b/ccShader_PositionColorLengthTexture.vert.patch @@ -1,6 +1,6 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_PositionColorLengthTexture.vert 2016-12-29 13:42:38.000000000 -0400 -+++ /tmp/ccShader_PositionColorLengthTexture.vert 2017-01-04 15:03:04.443307047 -0400 -@@ -19,9 +19,9 @@ +--- /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. */ @@ -9,10 +9,16 @@ -#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; -@@ -29,7 +29,7 @@ +@@ -33,7 +33,7 @@ varying mediump vec4 v_color; varying mediump vec2 v_texcoord; @@ -21,16 +27,16 @@ attribute vec4 a_position; attribute vec2 a_texcoord; -@@ -38,7 +38,7 @@ +@@ -42,7 +42,7 @@ varying vec4 v_color; varying vec2 v_texcoord; -#endif +\n#endif\n - void main() - { -@@ -47,4 +47,4 @@ + 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 index f2a71f1b9097..96d772772e02 100644 --- a/ccShader_PositionColorTextureAsPointsize.vert.patch +++ b/ccShader_PositionColorTextureAsPointsize.vert.patch @@ -1,5 +1,5 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_PositionColorTextureAsPointsize.vert 2016-12-29 13:42:38.000000000 -0400 -+++ /tmp/ccShader_PositionColorTextureAsPointsize.vert 2017-01-04 15:03:04.499967205 -0400 +--- /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. */ @@ -20,12 +20,12 @@ varying vec4 v_fragmentColor; -#endif +\n#endif\n + uniform float u_alpha; void main() - { -@@ -41,4 +41,4 @@ +@@ -42,4 +42,4 @@ gl_PointSize = a_texCoord.x; - v_fragmentColor = a_color; + 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 index f4571358462a..f1d5febea7cc 100644 --- a/ccShader_PositionTexture.frag.patch +++ b/ccShader_PositionTexture.frag.patch @@ -1,5 +1,5 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_PositionTexture.frag 2016-12-29 13:42:38.000000000 -0400 -+++ /tmp/ccShader_PositionTexture.frag 2017-01-04 15:03:04.556627363 -0400 +--- /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. */ diff --git a/ccShader_PositionTexture.vert.patch b/ccShader_PositionTexture.vert.patch index c8da94fdc743..0f0253ef1060 100644 --- a/ccShader_PositionTexture.vert.patch +++ b/ccShader_PositionTexture.vert.patch @@ -1,5 +1,5 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_PositionTexture.vert 2016-12-29 13:42:38.000000000 -0400 -+++ /tmp/ccShader_PositionTexture.vert 2017-01-04 15:03:04.613287520 -0400 +--- /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. */ diff --git a/ccShader_PositionTextureA8Color.frag.patch b/ccShader_PositionTextureA8Color.frag.patch index fb816bcdbbf3..1cc6c6f0ab46 100644 --- a/ccShader_PositionTextureA8Color.frag.patch +++ b/ccShader_PositionTextureA8Color.frag.patch @@ -1,5 +1,5 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_PositionTextureA8Color.frag 2016-12-29 13:42:38.000000000 -0400 -+++ /tmp/ccShader_PositionTextureA8Color.frag 2017-01-04 15:03:04.669947678 -0400 +--- /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. */ diff --git a/ccShader_PositionTextureA8Color.vert.patch b/ccShader_PositionTextureA8Color.vert.patch index 9ed1666828b6..e740e8222b4f 100644 --- a/ccShader_PositionTextureA8Color.vert.patch +++ b/ccShader_PositionTextureA8Color.vert.patch @@ -1,5 +1,5 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_PositionTextureA8Color.vert 2016-12-29 13:42:38.000000000 -0400 -+++ /tmp/ccShader_PositionTextureA8Color.vert 2017-01-04 15:03:04.726607836 -0400 +--- /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. */ diff --git a/ccShader_PositionTextureColor.frag.patch b/ccShader_PositionTextureColor.frag.patch index bcb1250e2a47..acc18b6b44b6 100644 --- a/ccShader_PositionTextureColor.frag.patch +++ b/ccShader_PositionTextureColor.frag.patch @@ -1,5 +1,5 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_PositionTextureColor.frag 2016-12-29 13:42:38.000000000 -0400 -+++ /tmp/ccShader_PositionTextureColor.frag 2017-01-04 15:03:04.783267993 -0400 +--- /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. */ diff --git a/ccShader_PositionTextureColor.vert.patch b/ccShader_PositionTextureColor.vert.patch index 5160cb453a09..2b4d046a279e 100644 --- a/ccShader_PositionTextureColor.vert.patch +++ b/ccShader_PositionTextureColor.vert.patch @@ -1,5 +1,5 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_PositionTextureColor.vert 2016-12-29 13:42:38.000000000 -0400 -+++ /tmp/ccShader_PositionTextureColor.vert 2017-01-04 15:03:04.819930449 -0400 +--- /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. */ diff --git a/ccShader_PositionTextureColorAlphaTest.frag.patch b/ccShader_PositionTextureColorAlphaTest.frag.patch index d79fa537fdb5..3487e252d0cd 100644 --- a/ccShader_PositionTextureColorAlphaTest.frag.patch +++ b/ccShader_PositionTextureColorAlphaTest.frag.patch @@ -1,5 +1,5 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_PositionTextureColorAlphaTest.frag 2016-12-29 13:42:38.000000000 -0400 -+++ /tmp/ccShader_PositionTextureColorAlphaTest.frag 2017-01-04 15:03:04.876590606 -0400 +--- /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. */ diff --git a/ccShader_PositionTextureColor_noMVP.frag.patch b/ccShader_PositionTextureColor_noMVP.frag.patch index 0f653a96e8db..598cb37145d2 100644 --- a/ccShader_PositionTextureColor_noMVP.frag.patch +++ b/ccShader_PositionTextureColor_noMVP.frag.patch @@ -1,5 +1,5 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_PositionTextureColor_noMVP.frag 2016-12-29 13:42:38.000000000 -0400 -+++ /tmp/ccShader_PositionTextureColor_noMVP.frag 2017-01-04 15:03:04.929917813 -0400 +--- /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. */ diff --git a/ccShader_PositionTextureColor_noMVP.vert.patch b/ccShader_PositionTextureColor_noMVP.vert.patch index b03e394cddb3..f0f3326acbfe 100644 --- a/ccShader_PositionTextureColor_noMVP.vert.patch +++ b/ccShader_PositionTextureColor_noMVP.vert.patch @@ -1,5 +1,5 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_PositionTextureColor_noMVP.vert 2016-12-29 13:42:38.000000000 -0400 -+++ /tmp/ccShader_PositionTextureColor_noMVP.vert 2017-01-04 15:03:04.983245021 -0400 +--- /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. */ diff --git a/ccShader_PositionTexture_uColor.frag.patch b/ccShader_PositionTexture_uColor.frag.patch index 3fda4a939c2c..9dda0b234e0c 100644 --- a/ccShader_PositionTexture_uColor.frag.patch +++ b/ccShader_PositionTexture_uColor.frag.patch @@ -1,5 +1,5 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_PositionTexture_uColor.frag 2016-12-29 13:42:38.000000000 -0400 -+++ /tmp/ccShader_PositionTexture_uColor.frag 2017-01-04 15:03:05.026573382 -0400 +--- /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. */ diff --git a/ccShader_PositionTexture_uColor.vert.patch b/ccShader_PositionTexture_uColor.vert.patch index 97f56e38f6e5..95a4e3b40c81 100644 --- a/ccShader_PositionTexture_uColor.vert.patch +++ b/ccShader_PositionTexture_uColor.vert.patch @@ -1,5 +1,5 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_PositionTexture_uColor.vert 2016-12-29 13:42:38.000000000 -0400 -+++ /tmp/ccShader_PositionTexture_uColor.vert 2017-01-04 15:03:05.083233554 -0400 +--- /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. */ diff --git a/ccShader_Position_uColor.frag.patch b/ccShader_Position_uColor.frag.patch index 8f44d84e3475..5a492115d91a 100644 --- a/ccShader_Position_uColor.frag.patch +++ b/ccShader_Position_uColor.frag.patch @@ -1,5 +1,5 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_Position_uColor.frag 2016-12-29 13:42:38.000000000 -0400 -+++ /tmp/ccShader_Position_uColor.frag 2017-01-04 15:03:05.129894872 -0400 +--- /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. */ diff --git a/ccShader_Position_uColor.vert.patch b/ccShader_Position_uColor.vert.patch index d421d0fe31f5..6beaa1662361 100644 --- a/ccShader_Position_uColor.vert.patch +++ b/ccShader_Position_uColor.vert.patch @@ -1,5 +1,5 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_Position_uColor.vert 2016-12-29 13:42:38.000000000 -0400 -+++ /tmp/ccShader_Position_uColor.vert 2017-01-04 15:03:05.183222092 -0400 +--- /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. */ diff --git a/ccShader_UI_Gray.frag.patch b/ccShader_UI_Gray.frag.patch index aa75bea7aff4..c8c6214ec15d 100644 --- a/ccShader_UI_Gray.frag.patch +++ b/ccShader_UI_Gray.frag.patch @@ -1,5 +1,5 @@ ---- /opt/cocos2d-x/cocos/renderer/ccShader_UI_Gray.frag 2016-12-29 13:42:38.000000000 -0400 -+++ /tmp/ccShader_UI_Gray.frag 2017-01-04 15:03:05.239882265 -0400 +--- /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( |