diff --git a/native/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_dragonbones_auto_api.js b/native/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_dragonbones_auto_api.js index fe8b9b83a1..a44963f1ce 100644 --- a/native/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_dragonbones_auto_api.js +++ b/native/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_dragonbones_auto_api.js @@ -1084,16 +1084,6 @@ Bone : function ( */ dragonBones.Slot = { -/** - * @method getRawDisplay - * @return {void} - */ -getRawDisplay : function ( -) -{ - return void; -}, - /** * @method getChildArmature * @return {dragonBones::Armature} @@ -1104,38 +1094,6 @@ getChildArmature : function ( return dragonBones::Armature; }, -/** - * @method getDisplay - * @return {void} - */ -getDisplay : function ( -) -{ - return void; -}, - -/** - * @method getMeshDisplay - * @return {void} - */ -getMeshDisplay : function ( -) -{ - return void; -}, - -/** - * @method setDisplay - * @param {void} arg0 - * @param {dragonBones::DisplayType} arg1 - */ -setDisplay : function ( -void, -displaytype -) -{ -}, - /** * @method invalidUpdate */ @@ -1676,6 +1634,23 @@ create : function ( }; +/** + * @class DBCCSprite + */ +dragonBones.DBCCSprite = { + +/** + * @method create + * @return {dragonBones::DBCCSprite} + */ +create : function ( +) +{ + return dragonBones::DBCCSprite; +}, + +}; + /** * @class CCSlot */ diff --git a/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_dragonbones_auto.cpp b/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_dragonbones_auto.cpp index 791ef58f54..0cd60cba5d 100644 --- a/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_dragonbones_auto.cpp +++ b/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_dragonbones_auto.cpp @@ -4571,24 +4571,6 @@ void js_register_cocos2dx_dragonbones_Bone(JSContext *cx, JS::HandleObject globa JSClass *jsb_dragonBones_Slot_class; JSObject *jsb_dragonBones_Slot_prototype; -bool js_cocos2dx_dragonbones_Slot_getRawDisplay(JSContext *cx, uint32_t argc, jsval *vp) -{ - JS::CallArgs args = JS::CallArgsFromVp(argc, vp); - JS::RootedObject obj(cx, args.thisv().toObjectOrNull()); - js_proxy_t *proxy = jsb_get_js_proxy(obj); - dragonBones::Slot* cobj = (dragonBones::Slot *)(proxy ? proxy->ptr : NULL); - JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_dragonbones_Slot_getRawDisplay : Invalid Native Object"); - if (argc == 0) { - void* ret = cobj->getRawDisplay(); - JS::RootedValue jsret(cx); - #pragma warning NO CONVERSION FROM NATIVE FOR void*; - args.rval().set(jsret); - return true; - } - - JS_ReportError(cx, "js_cocos2dx_dragonbones_Slot_getRawDisplay : wrong number of arguments: %d, was expecting %d", argc, 0); - return false; -} bool js_cocos2dx_dragonbones_Slot_getChildArmature(JSContext *cx, uint32_t argc, jsval *vp) { JS::CallArgs args = JS::CallArgsFromVp(argc, vp); @@ -4611,65 +4593,6 @@ bool js_cocos2dx_dragonbones_Slot_getChildArmature(JSContext *cx, uint32_t argc, JS_ReportError(cx, "js_cocos2dx_dragonbones_Slot_getChildArmature : wrong number of arguments: %d, was expecting %d", argc, 0); return false; } -bool js_cocos2dx_dragonbones_Slot_getDisplay(JSContext *cx, uint32_t argc, jsval *vp) -{ - JS::CallArgs args = JS::CallArgsFromVp(argc, vp); - JS::RootedObject obj(cx, args.thisv().toObjectOrNull()); - js_proxy_t *proxy = jsb_get_js_proxy(obj); - dragonBones::Slot* cobj = (dragonBones::Slot *)(proxy ? proxy->ptr : NULL); - JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_dragonbones_Slot_getDisplay : Invalid Native Object"); - if (argc == 0) { - void* ret = cobj->getDisplay(); - JS::RootedValue jsret(cx); - #pragma warning NO CONVERSION FROM NATIVE FOR void*; - args.rval().set(jsret); - return true; - } - - JS_ReportError(cx, "js_cocos2dx_dragonbones_Slot_getDisplay : wrong number of arguments: %d, was expecting %d", argc, 0); - return false; -} -bool js_cocos2dx_dragonbones_Slot_getMeshDisplay(JSContext *cx, uint32_t argc, jsval *vp) -{ - JS::CallArgs args = JS::CallArgsFromVp(argc, vp); - JS::RootedObject obj(cx, args.thisv().toObjectOrNull()); - js_proxy_t *proxy = jsb_get_js_proxy(obj); - dragonBones::Slot* cobj = (dragonBones::Slot *)(proxy ? proxy->ptr : NULL); - JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_dragonbones_Slot_getMeshDisplay : Invalid Native Object"); - if (argc == 0) { - void* ret = cobj->getMeshDisplay(); - JS::RootedValue jsret(cx); - #pragma warning NO CONVERSION FROM NATIVE FOR void*; - args.rval().set(jsret); - return true; - } - - JS_ReportError(cx, "js_cocos2dx_dragonbones_Slot_getMeshDisplay : wrong number of arguments: %d, was expecting %d", argc, 0); - return false; -} -bool js_cocos2dx_dragonbones_Slot_setDisplay(JSContext *cx, uint32_t argc, jsval *vp) -{ - JS::CallArgs args = JS::CallArgsFromVp(argc, vp); - bool ok = true; - JS::RootedObject obj(cx, args.thisv().toObjectOrNull()); - js_proxy_t *proxy = jsb_get_js_proxy(obj); - dragonBones::Slot* cobj = (dragonBones::Slot *)(proxy ? proxy->ptr : NULL); - JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_dragonbones_Slot_setDisplay : Invalid Native Object"); - if (argc == 2) { - void* arg0 = nullptr; - dragonBones::DisplayType arg1; - #pragma warning NO CONVERSION TO NATIVE FOR void* - ok = false; - ok &= jsval_to_int32(cx, args.get(1), (int32_t *)&arg1); - JSB_PRECONDITION2(ok, cx, false, "js_cocos2dx_dragonbones_Slot_setDisplay : Error processing arguments"); - cobj->setDisplay(arg0, arg1); - args.rval().setUndefined(); - return true; - } - - JS_ReportError(cx, "js_cocos2dx_dragonbones_Slot_setDisplay : wrong number of arguments: %d, was expecting %d", argc, 2); - return false; -} bool js_cocos2dx_dragonbones_Slot_invalidUpdate(JSContext *cx, uint32_t argc, jsval *vp) { JS::CallArgs args = JS::CallArgsFromVp(argc, vp); @@ -4828,11 +4751,7 @@ void js_register_cocos2dx_dragonbones_Slot(JSContext *cx, JS::HandleObject globa }; static JSFunctionSpec funcs[] = { - JS_FN("getRawDisplay", js_cocos2dx_dragonbones_Slot_getRawDisplay, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("getChildArmature", js_cocos2dx_dragonbones_Slot_getChildArmature, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), - JS_FN("getDisplay", js_cocos2dx_dragonbones_Slot_getDisplay, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), - JS_FN("getMeshDisplay", js_cocos2dx_dragonbones_Slot_getMeshDisplay, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), - JS_FN("setDisplay", js_cocos2dx_dragonbones_Slot_setDisplay, 2, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("invalidUpdate", js_cocos2dx_dragonbones_Slot_invalidUpdate, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("setDisplayIndex", js_cocos2dx_dragonbones_Slot_setDisplayIndex, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("setChildArmature", js_cocos2dx_dragonbones_Slot_setChildArmature, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), @@ -6555,6 +6474,72 @@ void js_register_cocos2dx_dragonbones_CCArmatureDisplay(JSContext *cx, JS::Handl jsb_register_class(cx, jsb_dragonBones_CCArmatureDisplay_class, proto, parent_proto); } +JSClass *jsb_dragonBones_DBCCSprite_class; +JSObject *jsb_dragonBones_DBCCSprite_prototype; + +bool js_cocos2dx_dragonbones_DBCCSprite_create(JSContext *cx, uint32_t argc, jsval *vp) +{ + JS::CallArgs args = JS::CallArgsFromVp(argc, vp); + if (argc == 0) { + + auto ret = dragonBones::DBCCSprite::create(); + js_type_class_t *typeClass = js_get_type_from_native(ret); + JS::RootedObject jsret(cx, jsb_ref_autoreleased_create_jsobject(cx, ret, typeClass, "dragonBones::DBCCSprite")); + args.rval().set(OBJECT_TO_JSVAL(jsret)); + return true; + } + JS_ReportError(cx, "js_cocos2dx_dragonbones_DBCCSprite_create : wrong number of arguments"); + return false; +} + + +extern JSObject *jsb_cocos2d_Sprite_prototype; + +void js_register_cocos2dx_dragonbones_DBCCSprite(JSContext *cx, JS::HandleObject global) { + jsb_dragonBones_DBCCSprite_class = (JSClass *)calloc(1, sizeof(JSClass)); + jsb_dragonBones_DBCCSprite_class->name = "DBCCSprite"; + jsb_dragonBones_DBCCSprite_class->addProperty = JS_PropertyStub; + jsb_dragonBones_DBCCSprite_class->delProperty = JS_DeletePropertyStub; + jsb_dragonBones_DBCCSprite_class->getProperty = JS_PropertyStub; + jsb_dragonBones_DBCCSprite_class->setProperty = JS_StrictPropertyStub; + jsb_dragonBones_DBCCSprite_class->enumerate = JS_EnumerateStub; + jsb_dragonBones_DBCCSprite_class->resolve = JS_ResolveStub; + jsb_dragonBones_DBCCSprite_class->convert = JS_ConvertStub; + jsb_dragonBones_DBCCSprite_class->flags = JSCLASS_HAS_RESERVED_SLOTS(2); + + static JSPropertySpec properties[] = { + JS_PS_END + }; + + static JSFunctionSpec funcs[] = { + JS_FS_END + }; + + static JSFunctionSpec st_funcs[] = { + JS_FN("create", js_cocos2dx_dragonbones_DBCCSprite_create, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), + JS_FS_END + }; + + JS::RootedObject parent_proto(cx, jsb_cocos2d_Sprite_prototype); + jsb_dragonBones_DBCCSprite_prototype = JS_InitClass( + cx, global, + parent_proto, + jsb_dragonBones_DBCCSprite_class, + dummy_constructor, 0, // no constructor + properties, + funcs, + NULL, // no static properties + st_funcs); + + JS::RootedObject proto(cx, jsb_dragonBones_DBCCSprite_prototype); + JS::RootedValue className(cx, std_string_to_jsval(cx, "DBCCSprite")); + JS_SetProperty(cx, proto, "_className", className); + JS_SetProperty(cx, proto, "__nativeObj", JS::TrueHandleValue); + JS_SetProperty(cx, proto, "__is_ref", JS::TrueHandleValue); + // add the proto and JSClass to the type->js info hash table + jsb_register_class(cx, jsb_dragonBones_DBCCSprite_class, proto, parent_proto); +} + JSClass *jsb_dragonBones_CCSlot_class; JSObject *jsb_dragonBones_CCSlot_prototype; @@ -6977,6 +6962,7 @@ void register_all_cocos2dx_dragonbones(JSContext* cx, JS::HandleObject obj) { js_register_cocos2dx_dragonbones_BaseFactory(cx, ns); js_register_cocos2dx_dragonbones_CCFactory(cx, ns); js_register_cocos2dx_dragonbones_WorldClock(cx, ns); + js_register_cocos2dx_dragonbones_DBCCSprite(cx, ns); js_register_cocos2dx_dragonbones_TextureAtlasData(cx, ns); js_register_cocos2dx_dragonbones_CCArmatureDisplay(cx, ns); js_register_cocos2dx_dragonbones_AnimationState(cx, ns); diff --git a/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_dragonbones_auto.hpp b/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_dragonbones_auto.hpp index b40a4d1ebc..58d18c8718 100644 --- a/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_dragonbones_auto.hpp +++ b/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_dragonbones_auto.hpp @@ -230,11 +230,7 @@ bool js_cocos2dx_dragonbones_Slot_constructor(JSContext *cx, uint32_t argc, jsva void js_cocos2dx_dragonbones_Slot_finalize(JSContext *cx, JSObject *obj); void js_register_cocos2dx_dragonbones_Slot(JSContext *cx, JS::HandleObject global); void register_all_cocos2dx_dragonbones(JSContext* cx, JS::HandleObject obj); -bool js_cocos2dx_dragonbones_Slot_getRawDisplay(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_dragonbones_Slot_getChildArmature(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_dragonbones_Slot_getDisplay(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_dragonbones_Slot_getMeshDisplay(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_dragonbones_Slot_setDisplay(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_dragonbones_Slot_invalidUpdate(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_dragonbones_Slot_setDisplayIndex(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_dragonbones_Slot_setChildArmature(JSContext *cx, uint32_t argc, jsval *vp); @@ -332,6 +328,15 @@ bool js_cocos2dx_dragonbones_CCArmatureDisplay_hasEvent(JSContext *cx, uint32_t bool js_cocos2dx_dragonbones_CCArmatureDisplay_getArmature(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_dragonbones_CCArmatureDisplay_create(JSContext *cx, uint32_t argc, jsval *vp); +extern JSClass *jsb_dragonBones_DBCCSprite_class; +extern JSObject *jsb_dragonBones_DBCCSprite_prototype; + +bool js_cocos2dx_dragonbones_DBCCSprite_constructor(JSContext *cx, uint32_t argc, jsval *vp); +void js_cocos2dx_dragonbones_DBCCSprite_finalize(JSContext *cx, JSObject *obj); +void js_register_cocos2dx_dragonbones_DBCCSprite(JSContext *cx, JS::HandleObject global); +void register_all_cocos2dx_dragonbones(JSContext* cx, JS::HandleObject obj); +bool js_cocos2dx_dragonbones_DBCCSprite_create(JSContext *cx, uint32_t argc, jsval *vp); + extern JSClass *jsb_dragonBones_CCSlot_class; extern JSObject *jsb_dragonBones_CCSlot_prototype; diff --git a/native/cocos/scripting/js-bindings/manual/dragonbones/jsb_cocos2dx_dragonbones_manual.cpp b/native/cocos/scripting/js-bindings/manual/dragonbones/jsb_cocos2dx_dragonbones_manual.cpp index de243c4531..5c1a1112c0 100644 --- a/native/cocos/scripting/js-bindings/manual/dragonbones/jsb_cocos2dx_dragonbones_manual.cpp +++ b/native/cocos/scripting/js-bindings/manual/dragonbones/jsb_cocos2dx_dragonbones_manual.cpp @@ -357,6 +357,86 @@ bool js_cocos2dx_dragonbones_TransformObject_getOffset(JSContext *cx, JS::Handle return true; } +bool js_cocos2dx_dragonbones_Slot_getRawDisplay(JSContext *cx, uint32_t argc, jsval *vp) +{ + JS::CallArgs args = JS::CallArgsFromVp(argc, vp); + JS::RootedObject obj(cx, args.thisv().toObjectOrNull()); + js_proxy_t *proxy = jsb_get_js_proxy(obj); + dragonBones::Slot* cobj = (dragonBones::Slot *)(proxy ? proxy->ptr : NULL); + JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_dragonbones_Slot_getRawDisplay : Invalid Native Object"); + if (argc == 0) { + dragonBones::DBCCSprite* ret = static_cast(cobj->getRawDisplay()); + JS::RootedValue jsret(cx, OBJECT_TO_JSVAL(js_get_or_create_jsobject(cx, ret))); + args.rval().set(jsret); + return true; + } + + JS_ReportError(cx, "js_cocos2dx_dragonbones_Slot_getRawDisplay : wrong number of arguments: %d, was expecting %d", argc, 0); + return false; +} + +bool js_cocos2dx_dragonbones_Slot_getDisplay(JSContext *cx, uint32_t argc, jsval *vp) +{ + JS::CallArgs args = JS::CallArgsFromVp(argc, vp); + JS::RootedObject obj(cx, args.thisv().toObjectOrNull()); + js_proxy_t *proxy = jsb_get_js_proxy(obj); + dragonBones::Slot* cobj = (dragonBones::Slot *)(proxy ? proxy->ptr : NULL); + JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_dragonbones_Slot_getDisplay : Invalid Native Object"); + if (argc == 0) { + dragonBones::DBCCSprite* ret = static_cast(cobj->getDisplay()); + JS::RootedValue jsret(cx, OBJECT_TO_JSVAL(js_get_or_create_jsobject(cx, ret))); + args.rval().set(jsret); + return true; + } + + JS_ReportError(cx, "js_cocos2dx_dragonbones_Slot_getDisplay : wrong number of arguments: %d, was expecting %d", argc, 0); + return false; +} + +bool js_cocos2dx_dragonbones_Slot_getMeshDisplay(JSContext *cx, uint32_t argc, jsval *vp) +{ + JS::CallArgs args = JS::CallArgsFromVp(argc, vp); + JS::RootedObject obj(cx, args.thisv().toObjectOrNull()); + js_proxy_t *proxy = jsb_get_js_proxy(obj); + dragonBones::Slot* cobj = (dragonBones::Slot *)(proxy ? proxy->ptr : NULL); + JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_dragonbones_Slot_getMeshDisplay : Invalid Native Object"); + if (argc == 0) { + dragonBones::DBCCSprite* ret = static_cast(cobj->getMeshDisplay()); + JS::RootedValue jsret(cx, OBJECT_TO_JSVAL(js_get_or_create_jsobject(cx, ret))); + args.rval().set(jsret); + return true; + } + + JS_ReportError(cx, "js_cocos2dx_dragonbones_Slot_getMeshDisplay : wrong number of arguments: %d, was expecting %d", argc, 0); + return false; +} + +bool js_cocos2dx_dragonbones_Slot_setDisplay(JSContext *cx, uint32_t argc, jsval *vp) +{ + JS::CallArgs args = JS::CallArgsFromVp(argc, vp); + bool ok = true; + JS::RootedObject obj(cx, args.thisv().toObjectOrNull()); + js_proxy_t *proxy = jsb_get_js_proxy(obj); + dragonBones::Slot* cobj = (dragonBones::Slot *)(proxy ? proxy->ptr : NULL); + JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_dragonbones_Slot_setDisplay : Invalid Native Object"); + if (argc == 2) { + ok = false; + js_proxy_t *jsProxy; + JS::RootedObject tmpObj(cx, args.get(0).toObjectOrNull()); + jsProxy = jsb_get_js_proxy(tmpObj); + dragonBones::DBCCSprite* arg0 = (dragonBones::DBCCSprite*)(jsProxy ? jsProxy->ptr : NULL); + dragonBones::DisplayType arg1; + ok &= jsval_to_int32(cx, args.get(1), (int32_t *)&arg1); + JSB_PRECONDITION2(ok, cx, false, "js_cocos2dx_dragonbones_Slot_setDisplay : Error processing arguments"); + cobj->setDisplay(arg0, arg1); + args.rval().setUndefined(); + return true; + } + + JS_ReportError(cx, "js_cocos2dx_dragonbones_Slot_setDisplay : wrong number of arguments: %d, was expecting %d", argc, 2); + return false; +} + extern JSObject *jsb_dragonBones_Armature_prototype; extern JSObject *jsb_dragonBones_ArmatureData_prototype; extern JSObject *jsb_dragonBones_DragonBonesData_prototype; @@ -364,6 +444,7 @@ extern JSObject *jsb_dragonBones_CCArmatureDisplay_prototype; extern JSObject *jsb_dragonBones_AnimationState_prototype; extern JSObject *jsb_dragonBones_TransformObject_prototype; extern JSObject *jsb_dragonBones_WorldClock_prototype; +extern JSObject *jsb_dragonBones_Slot_prototype; void register_all_cocos2dx_dragonbones_manual(JSContext* cx, JS::HandleObject global) { @@ -405,4 +486,10 @@ void register_all_cocos2dx_dragonbones_manual(JSContext* cx, JS::HandleObject gl JS_DefineProperty(cx, transformObject, "global", JS::UndefinedHandleValue, JSPROP_ENUMERATE | JSPROP_PERMANENT, js_cocos2dx_dragonbones_TransformObject_getGlobal); JS_DefineProperty(cx, transformObject, "origin", JS::UndefinedHandleValue, JSPROP_ENUMERATE | JSPROP_PERMANENT, js_cocos2dx_dragonbones_TransformObject_getOrigin); JS_DefineProperty(cx, transformObject, "offset", JS::UndefinedHandleValue, JSPROP_ENUMERATE | JSPROP_PERMANENT, js_cocos2dx_dragonbones_TransformObject_getOffset); + + JS::RootedObject slotObject(cx, jsb_dragonBones_Slot_prototype); + JS_DefineFunction(cx, slotObject, "getRawDisplay", js_cocos2dx_dragonbones_Slot_getRawDisplay, 0, JSPROP_ENUMERATE | JSPROP_PERMANENT); + JS_DefineFunction(cx, slotObject, "getDisplay", js_cocos2dx_dragonbones_Slot_getDisplay, 0, JSPROP_ENUMERATE | JSPROP_PERMANENT); + JS_DefineFunction(cx, slotObject, "getMeshDisplay", js_cocos2dx_dragonbones_Slot_getMeshDisplay, 0, JSPROP_ENUMERATE | JSPROP_PERMANENT); + JS_DefineFunction(cx, slotObject, "setDisplay", js_cocos2dx_dragonbones_Slot_setDisplay, 0, JSPROP_ENUMERATE | JSPROP_PERMANENT); } diff --git a/native/cocos/scripting/js-bindings/manual/dragonbones/jsb_cocos2dx_dragonbones_manual.h b/native/cocos/scripting/js-bindings/manual/dragonbones/jsb_cocos2dx_dragonbones_manual.h index 12e875287e..18575b12f0 100644 --- a/native/cocos/scripting/js-bindings/manual/dragonbones/jsb_cocos2dx_dragonbones_manual.h +++ b/native/cocos/scripting/js-bindings/manual/dragonbones/jsb_cocos2dx_dragonbones_manual.h @@ -49,4 +49,9 @@ bool js_cocos2dx_dragonbones_TransformObject_getGlobal(JSContext *cx, JS::Handle bool js_cocos2dx_dragonbones_TransformObject_getOrigin(JSContext *cx, JS::HandleObject obj, JS::HandleId id, JS::MutableHandleValue vp); bool js_cocos2dx_dragonbones_TransformObject_getOffset(JSContext *cx, JS::HandleObject obj, JS::HandleId id, JS::MutableHandleValue vp); +bool js_cocos2dx_dragonbones_Slot_getRawDisplay(JSContext *cx, uint32_t argc, jsval *vp); +bool js_cocos2dx_dragonbones_Slot_getDisplay(JSContext *cx, uint32_t argc, jsval *vp); +bool js_cocos2dx_dragonbones_Slot_getMeshDisplay(JSContext *cx, uint32_t argc, jsval *vp); +bool js_cocos2dx_dragonbones_Slot_setDisplay(JSContext *cx, uint32_t argc, jsval *vp); + #endif /* defined(__jsb_cocos2dx_dragonbones_manual__) */ diff --git a/native/cocos/scripting/js-bindings/script/jsb_dragonbones.js b/native/cocos/scripting/js-bindings/script/jsb_dragonbones.js index 2972c8d096..087f96ab48 100644 --- a/native/cocos/scripting/js-bindings/script/jsb_dragonbones.js +++ b/native/cocos/scripting/js-bindings/script/jsb_dragonbones.js @@ -34,6 +34,9 @@ cc.defineGetterSetter(armatureProto, 'name', armatureProto.getName, null); var animationStateProto = dragonBones.AnimationState.prototype; cc.defineGetterSetter(animationStateProto, 'name', animationStateProto.getName); +var slotProto = dragonBones.Slot.prototype; +cc.defineGetterSetter(slotProto, 'display', slotProto.getDisplay); + dragonBones.EventObject.START = "start"; dragonBones.EventObject.LOOP_COMPLETE = "loopComplete"; dragonBones.EventObject.COMPLETE = "complete"; diff --git a/native/tools/tojs/cocos2dx_dragonbones.ini b/native/tools/tojs/cocos2dx_dragonbones.ini index fe98ce608b..ea96c4cf56 100644 --- a/native/tools/tojs/cocos2dx_dragonbones.ini +++ b/native/tools/tojs/cocos2dx_dragonbones.ini @@ -20,7 +20,7 @@ extra_arguments = %(android_headers)s %(clang_headers)s %(cxxgenerator_headers)s headers = %(cocosdir)s/cocos/editor-support/dragonbones/cocos2dx/CCDragonBonesHeaders.h -classes = DragonBonesData CCFactory CCArmatureDisplay Armature CCSlot WorldClock Animation Slot BaseFactory BaseObject TextureData CCTextureData TextureAtlasData CCTextureAtlasData AnimationState EventObject Bone Transform Matrix TransformObject ArmatureData BoneData SlotData SkinData AnimationData +classes = DragonBonesData CCFactory CCArmatureDisplay Armature CCSlot WorldClock Animation Slot BaseFactory BaseObject TextureData CCTextureData TextureAtlasData CCTextureAtlasData AnimationState EventObject Bone Transform Matrix TransformObject ArmatureData BoneData SlotData SkinData AnimationData DBCCSprite abstract_classes = Slot BaseFactory BaseObject TextureAtlasData TextureData TransformObject @@ -29,7 +29,7 @@ skip = CCFactory::[loadDragonBonesData loadTextureAtlasData], Armature::[_addSlotToSlotList _removeBoneFromBoneList _bufferEvent _addBoneToBoneList _removeSlotFromSlotList getArmatureData getAnimation getBones getSlots getDisplay], Bone::[_setIK _update getBones getSlots], Animation::[_advanceTime _updateFFDTimelineStates _setArmature _setParent setAnimations getAnimations], - Slot::[_setArmature _update _updateBlendMode _updateMeshData _setBlendMode _updateVisible _setDisplayIndex setDisplayList getDisplayList _setColor _setDisplayList], + Slot::[getDisplay$ getRawDisplay getMeshDisplay setDisplay$ _setArmature _update _updateBlendMode _updateMeshData _setBlendMode _updateVisible _setDisplayIndex setDisplayList getDisplayList _setColor _setDisplayList], CCArmatureDisplay::[_onClear _dispatchEvent getAnimation], AnimationState::[getAnimationData _isDisabled _fadeIn _updateTimelineStates _updateFFDTimelineStates _advanceTime], CCSlot::[_onClear], @@ -38,7 +38,8 @@ skip = CCFactory::[loadDragonBonesData loadTextureAtlasData], WorldClock::[add remove], ArmatureData::[cacheFrames addBone addSlot addSkin addAnimation getSortedBones getSortedSlots], AnimationData::[cacheFrames addBoneTimeline addSlotTimeline addFFDTimeline getBontTimeline getSlotTimeline getFFDTimeline], - SkinData::[addSlot getSlot] + SkinData::[addSlot getSlot], + DBCCSprite::[getPolygonInfoModify draw] field = TransformObject::[name globalTransformMatrix], Transform::[x y skewX skewY scaleX scaleY],