From e55e68fc714802aa6e60442fed00fafc34d6e0b8 Mon Sep 17 00:00:00 2001 From: James Chen Date: Fri, 11 Aug 2017 10:24:05 +0800 Subject: [PATCH 1/6] Fixes compilation errors for android x86 audio module and fixes a typo --- native/cocos/audio/android/cutils/bitops.h | 76 ---------------------- native/cocos/audio/win32/AudioCache.h | 2 +- 2 files changed, 1 insertion(+), 77 deletions(-) diff --git a/native/cocos/audio/android/cutils/bitops.h b/native/cocos/audio/android/cutils/bitops.h index 8f6891258e..33168b4a2b 100644 --- a/native/cocos/audio/android/cutils/bitops.h +++ b/native/cocos/audio/android/cutils/bitops.h @@ -24,82 +24,6 @@ __BEGIN_DECLS -/* - * Bitmask Operations - * - * Note this doesn't provide any locking/exclusion, and isn't atomic. - * Additionally no bounds checking is done on the bitmask array. - * - * Example: - * - * int num_resources; - * unsigned int resource_bits[BITS_TO_WORDS(num_resources)]; - * bitmask_init(resource_bits, num_resources); - * ... - * int bit = bitmask_ffz(resource_bits, num_resources); - * bitmask_set(resource_bits, bit); - * ... - * if (bitmask_test(resource_bits, bit)) { ... } - * ... - * bitmask_clear(resource_bits, bit); - * - */ - -#define BITS_PER_WORD (sizeof(unsigned int) * 8) -#define BITS_TO_WORDS(x) (((x) + BITS_PER_WORD - 1) / BITS_PER_WORD) -#define BIT_IN_WORD(x) ((x) % BITS_PER_WORD) -#define BIT_WORD(x) ((x) / BITS_PER_WORD) -#define BIT_MASK(x) (1 << BIT_IN_WORD(x)) - -static inline void bitmask_init(unsigned int *bitmask, int num_bits) -{ - memset(bitmask, 0, BITS_TO_WORDS(num_bits)*sizeof(unsigned int)); -} - -static inline int bitmask_ffz(unsigned int *bitmask, int num_bits) -{ - int bit, result; - size_t i; - - for (i = 0; i < BITS_TO_WORDS(num_bits); i++) { - bit = ffs(~bitmask[i]); - if (bit) { - // ffs is 1-indexed, return 0-indexed result - bit--; - result = BITS_PER_WORD * i + bit; - if (result >= num_bits) - return -1; - return result; - } - } - return -1; -} - -static inline int bitmask_weight(unsigned int *bitmask, int num_bits) -{ - size_t i; - int weight = 0; - - for (i = 0; i < BITS_TO_WORDS(num_bits); i++) - weight += __builtin_popcount(bitmask[i]); - return weight; -} - -static inline void bitmask_set(unsigned int *bitmask, int bit) -{ - bitmask[BIT_WORD(bit)] |= BIT_MASK(bit); -} - -static inline void bitmask_clear(unsigned int *bitmask, int bit) -{ - bitmask[BIT_WORD(bit)] &= ~BIT_MASK(bit); -} - -static inline bool bitmask_test(unsigned int *bitmask, int bit) -{ - return bitmask[BIT_WORD(bit)] & BIT_MASK(bit); -} - static inline int popcount(unsigned int x) { return __builtin_popcount(x); diff --git a/native/cocos/audio/win32/AudioCache.h b/native/cocos/audio/win32/AudioCache.h index 3327087ba8..dcbf65f346 100644 --- a/native/cocos/audio/win32/AudioCache.h +++ b/native/cocos/audio/win32/AudioCache.h @@ -38,7 +38,7 @@ #include #endif #include "platform/CCPlatformMacros.h" -#include "audio/apple/AudioMacros.h" +#include "audio/win32/AudioMacros.h" NS_CC_BEGIN namespace experimental{ From d2856798eb2fcc5aa03c17438509b3bc9635147b Mon Sep 17 00:00:00 2001 From: pandamicro Date: Fri, 11 Aug 2017 11:29:01 +0800 Subject: [PATCH 2/6] Fix arm64 crash during restart --- native/extensions/anysdk/js-bindings/manualanysdkbindings.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/native/extensions/anysdk/js-bindings/manualanysdkbindings.cpp b/native/extensions/anysdk/js-bindings/manualanysdkbindings.cpp index bbe447f937..745a143032 100644 --- a/native/extensions/anysdk/js-bindings/manualanysdkbindings.cpp +++ b/native/extensions/anysdk/js-bindings/manualanysdkbindings.cpp @@ -1934,7 +1934,6 @@ void register_all_anysdk_manual(JSContext* cx, JS::HandleObject obj) { cocos2d::EventListenerCustom* _event = cocos2d::Director::getInstance()->getEventDispatcher()->addCustomEventListener(ScriptingCore::EVENT_RESET, [&](cocos2d::EventCustom *event) { cocos2d::Director::getInstance()->getEventDispatcher()->removeEventListener(_event); - CC_SAFE_RELEASE(_event); ProtocolIAPResultListener::clear(); if (ProtocolAdsResultListener::_instance != nullptr) @@ -1962,5 +1961,4 @@ void register_all_anysdk_manual(JSContext* cx, JS::HandleObject obj) { CC_SAFE_DELETE(ProtocolRECListener::_instance); } }); - _event->retain(); } From 5d3268f0a7b4cfa46e3b529475a0a0eda1f1ea62 Mon Sep 17 00:00:00 2001 From: 2youyou2 <501251991@qq.com> Date: Tue, 15 Aug 2017 11:43:36 +0800 Subject: [PATCH 3/6] fixed graphics crash --- native/cocos/editor-support/creator/CCGraphicsNode.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/native/cocos/editor-support/creator/CCGraphicsNode.cpp b/native/cocos/editor-support/creator/CCGraphicsNode.cpp index e3a98c2006..c6819a296d 100644 --- a/native/cocos/editor-support/creator/CCGraphicsNode.cpp +++ b/native/cocos/editor-support/creator/CCGraphicsNode.cpp @@ -1028,8 +1028,9 @@ void GraphicsNode::allocBuffer() { if (_buffer) { const auto iterator = std::find(_buffers.begin(), _buffers.end(), _buffer); - if (iterator != _buffers.end()) { + if (iterator != _buffers.end() && (*iterator) != _buffers.back()) { _buffer = *(iterator+1); + return; } } From fee0b3d4d8dab1cd37015e132297f17dbdf59da9 Mon Sep 17 00:00:00 2001 From: 2youyou2 <501251991@qq.com> Date: Tue, 15 Aug 2017 11:46:50 +0800 Subject: [PATCH 4/6] replace tab to 4 spaces --- native/cocos/editor-support/creator/CCGraphicsNode.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/native/cocos/editor-support/creator/CCGraphicsNode.cpp b/native/cocos/editor-support/creator/CCGraphicsNode.cpp index c6819a296d..6de8e6fbea 100644 --- a/native/cocos/editor-support/creator/CCGraphicsNode.cpp +++ b/native/cocos/editor-support/creator/CCGraphicsNode.cpp @@ -1030,7 +1030,7 @@ void GraphicsNode::allocBuffer() const auto iterator = std::find(_buffers.begin(), _buffers.end(), _buffer); if (iterator != _buffers.end() && (*iterator) != _buffers.back()) { _buffer = *(iterator+1); - return; + return; } } From 40812d7000cc3fceeaf3097781ab4610833a8fa2 Mon Sep 17 00:00:00 2001 From: 2youyou2 <501251991@qq.com> Date: Tue, 15 Aug 2017 17:54:03 +0800 Subject: [PATCH 5/6] support debug windows simulator --- .../frameworks/runtime-src/proj.win32/simulator.vcxproj | 7 +++++-- .../runtime-src/proj.win32/simulator.vcxproj.user | 5 ++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/native/tools/simulator/frameworks/runtime-src/proj.win32/simulator.vcxproj b/native/tools/simulator/frameworks/runtime-src/proj.win32/simulator.vcxproj index 8e8143caf4..50f092fd7b 100755 --- a/native/tools/simulator/frameworks/runtime-src/proj.win32/simulator.vcxproj +++ b/native/tools/simulator/frameworks/runtime-src/proj.win32/simulator.vcxproj @@ -94,8 +94,8 @@ true $(OutDir);$(EngineRoot)external\win32\libs;%(AdditionalLibraryDirectories) libcurl.lib;websockets.lib;mozjs-52.lib;mozglue.lib;libSpine.lib;libDragonBones.lib;%(AdditionalDependencies) - $(ProjectDir)../../../runtime/win32/$(TargetName).pdb - $(ProjectDir)../../../runtime/win32/$(TargetName)$(TargetExt) + $(OutDir)$(TargetName).pdb + $(OutDir)$(TargetName)$(TargetExt) libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -135,6 +135,9 @@ if not exist "$(ProjectDir)..\..\..\runtime\win32" mkdir "$(ProjectDir)..\..\..\ xcopy /Y /Q "$(OutDir)*.dll" "$(ProjectDir)..\..\..\runtime\win32" xcopy /Y /Q "$(OutDir)*.exe" "$(ProjectDir)..\..\..\runtime\win32" xcopy /Y /Q "$(OutDir)lang" "$(ProjectDir)..\..\..\runtime\win32" + + +if exist "$(ProjectDir)..\..\..\..\..\simulator\win32\config.json" copy "$(ProjectDir)..\..\..\..\..\simulator\win32\config.json" "$(OutDir)config.json" diff --git a/native/tools/simulator/frameworks/runtime-src/proj.win32/simulator.vcxproj.user b/native/tools/simulator/frameworks/runtime-src/proj.win32/simulator.vcxproj.user index 0786ac218a..4f70951fe7 100755 --- a/native/tools/simulator/frameworks/runtime-src/proj.win32/simulator.vcxproj.user +++ b/native/tools/simulator/frameworks/runtime-src/proj.win32/simulator.vcxproj.user @@ -8,9 +8,8 @@ $(OutDir) - $(TargetPath) - - + $(OutDir)$(TargetName)$(TargetExt) + -search-path "$(ProjectDir)..\..\..\..\..\simulator\win32" $(TargetPath) From 53941d8df8ce8b5ad109995ae9619ef935767897 Mon Sep 17 00:00:00 2001 From: knoxHuang <821686174@qq.com> Date: Wed, 16 Aug 2017 17:20:34 +0800 Subject: [PATCH 6/6] add setJavascriptInterfaceScheme and setOnJSCallback to webview for fireball/issues/6251 --- native/tools/tojs/cocos2dx_experimental_webView.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/native/tools/tojs/cocos2dx_experimental_webView.ini b/native/tools/tojs/cocos2dx_experimental_webView.ini index 7f58f886ee..339d1c9ac0 100644 --- a/native/tools/tojs/cocos2dx_experimental_webView.ini +++ b/native/tools/tojs/cocos2dx_experimental_webView.ini @@ -38,7 +38,7 @@ classes = WebView # will apply to all class names. This is a convenience wildcard to be able to skip similar named # functions from all classes. -skip = WebView::[setOnShouldStartLoading setOnDidFinishLoading setOnDidFailLoading setOnJSCallback loadData] +skip = WebView::[setOnShouldStartLoading setOnDidFinishLoading setOnDidFailLoading loadData] rename_functions =