Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15109 from dongtaohan/v3 

exported api for Cocos Studio.
This commit is contained in:
pandamicro 2016-02-25 14:35:57 +08:00
parent 699b76c738 34b1c1bc18
commit e991282ed8
4 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/scripting/js-bindings/manual/ScriptingCore.h
View File

@ -657,7 +657,7 @@ JSObject* jsb_ref_autoreleased_get_or_create_jsobject(JSContext *cx, cocos2d::Re
* The reference created from JSObject to native object is weak because it won't retain it. * The reference created from JSObject to native object is weak because it won't retain it.
* The behavior is exactly the same with 'jsb_ref_get_or_create_jsobject' when CC_ENABLE_GC_FOR_NATIVE_OBJECTS desactivated. * The behavior is exactly the same with 'jsb_ref_get_or_create_jsobject' when CC_ENABLE_GC_FOR_NATIVE_OBJECTS desactivated.
*/ */
JSObject* jsb_get_or_create_weak_jsobject(JSContext *cx, void *native, js_type_class_t *typeClass, const char* debug); CC_JS_DLL JSObject* jsb_get_or_create_weak_jsobject(JSContext *cx, void *native, js_type_class_t *typeClass, const char* debug);
/** /**
* Register finalize hook and its owner as an entry in _js_hook_owner_map, * Register finalize hook and its owner as an entry in _js_hook_owner_map,

5
cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
View File

@ -544,6 +544,11 @@ JSObject* getObjectFromNamespace(JSContext* cx, JS::HandleObject ns, const char
return NULL; return NULL;
} }
js_type_class_t *js_get_type_from_node(cocos2d::Node* native_obj)
{
return js_get_type_from_native<cocos2d::Node>(native_obj);
}
void js_add_FinalizeHook(JSContext *cx, JS::HandleObject target) void js_add_FinalizeHook(JSContext *cx, JS::HandleObject target)
{ {
JS::RootedObject proto(cx, jsb_FinalizeHook_prototype); JS::RootedObject proto(cx, jsb_FinalizeHook_prototype);

5
cocos/scripting/js-bindings/manual/cocos2d_specifics.hpp
View File

@ -83,6 +83,11 @@ inline js_type_class_t *js_get_type_from_native(T* native_obj) {
return found ? typeProxyIter->second : nullptr; return found ? typeProxyIter->second : nullptr;
} }
/**
* get type from a cocos2d::Node, call function(js_get_type_from_native) above.
*/
CC_JS_DLL js_type_class_t *js_get_type_from_node(cocos2d::Node* native_obj);
/** /**
* Gets or creates a JSObject based on native_obj. * Gets or creates a JSObject based on native_obj.
* If native_obj is subclass of Ref, it will use the jsb_ref functions. * If native_obj is subclass of Ref, it will use the jsb_ref functions.

2
cocos/scripting/js-bindings/manual/js_manual_conversions.h
View File

@ -263,7 +263,7 @@ jsval ushort_to_jsval( JSContext *cx, unsigned short number );
jsval long_to_jsval( JSContext *cx, long number ); jsval long_to_jsval( JSContext *cx, long number );
jsval ulong_to_jsval(JSContext* cx, unsigned long v); jsval ulong_to_jsval(JSContext* cx, unsigned long v);
jsval long_long_to_jsval(JSContext* cx, long long v); jsval long_long_to_jsval(JSContext* cx, long long v);
jsval std_string_to_jsval(JSContext* cx, const std::string& v); CC_JS_DLL jsval std_string_to_jsval(JSContext* cx, const std::string& v);
jsval c_string_to_jsval(JSContext* cx, const char* v, size_t length = -1); jsval c_string_to_jsval(JSContext* cx, const char* v, size_t length = -1);
jsval ccpoint_to_jsval(JSContext* cx, const cocos2d::Point& v); jsval ccpoint_to_jsval(JSContext* cx, const cocos2d::Point& v);
jsval ccrect_to_jsval(JSContext* cx, const cocos2d::Rect& v); jsval ccrect_to_jsval(JSContext* cx, const cocos2d::Rect& v);