mirror of https://github.com/axmolengine/axmol.git
e8c0844dd5
1) Changed cc.REPEAT_FOREVER = - 1 to cc.REPEAT_FOREVER = 0xffffffff
[Reason]: If cc.REPEAT_FOREVER = -1, it will be a very big double value after converting it to double by JS_ValueToNumber on android.
Then cast it to unsigned int, the value will be 0. The schedule will not be able to work.
I don't know why this occurs only on android.
[Solution]: Instead of passing -1 to it, I assign it with max value of unsigned int in c++.
2) Added two helper function, cc.ArrayGetIndexOfObject and cc.ArrayContainsObject.
3) Added JSScheduleWrapper::removeTargetForNativeNode to avoid memory leaks.
4) Improvments for JSTouchDelegate. Added four functions as follows:
// Set the touch delegate to map by using the key (pJSObj).
static void setDelegateForJSObject(JSObject* pJSObj, JSTouchDelegate* pDelegate);
// Get the touch delegate by the key (pJSObj).
static JSTouchDelegate* getDelegateForJSObject(JSObject* pJSObj);
// Remove the delegate by the key (pJSObj).
static void removeDelegateForJSObject(JSObject* pJSObj);
void unregisterTouchDelegate();
And exported cc.unregisterTouchDelegate(); to js.
Fix a memory leak for JSTouchDelegate by making it as an autorelease object.
5) Don't add js callback function to the reserved slot of object.
[Reason]: The target object may execute more than one schedule.
Therefore, previous js callback function will be replaced
by the current one. For example:
this.scheduleOnce(function() { temporary function 1 }, 0.5);
this.scheduleOnce(function() { temporary function 2 }, 0.5);
In this case, the temporary function 1 will be removed from reserved slot 0.
And temporary function 2 will be set to reserved slot 0 of this object.
If gc is triggered before the JSScheduleWrapper::scheduleFunc is invoked,
crash will happen. You could simply reproduce it by adding jsc.garbageCollect(); after scheduleOnce.
[Solution] Because one schedule corresponds to one JSScheduleWrapper, we root
the js callback function in JSScheduleWrapper::setJSCallbackFunc and unroot it
at the destructor of JSScheduleWrapper.
|
||
|---|---|---|
| .. | ||
| generated@4b8684dfb4 | ||
| js | ||
| Android.mk | ||
| ScriptingCore.cpp | ||
| ScriptingCore.h | ||
| cocos2d_specifics.cpp | ||
| cocos2d_specifics.hpp | ||
| cocosjs_manual_conversions.cpp | ||
| cocosjs_manual_conversions.h | ||
| js_bindings_ccbreader.cpp | ||
| js_bindings_ccbreader.h | ||
| js_bindings_chipmunk_auto_classes.cpp.REMOVED.git-id | ||
| js_bindings_chipmunk_auto_classes.h | ||
| js_bindings_chipmunk_auto_classes_registration.h | ||
| js_bindings_chipmunk_functions.cpp.REMOVED.git-id | ||
| js_bindings_chipmunk_functions.h | ||
| js_bindings_chipmunk_functions_registration.h | ||
| js_bindings_chipmunk_manual.cpp | ||
| js_bindings_chipmunk_manual.h | ||
| js_bindings_chipmunk_registration.cpp | ||
| js_bindings_chipmunk_registration.h | ||
| js_bindings_config.h | ||
| js_bindings_core.cpp | ||
| js_bindings_core.h | ||
| js_manual_conversions.cpp | ||
| js_manual_conversions.h | ||
| spidermonkey_specifics.h | ||
| uthash.h | ||