Merge pull request #32 from sunnylanwanjun/spine-binding2

Upgrade spine to 3.7 (replace spine c to cpp)
cocos · May 29, 2019 · c5f8eb9 · c5f8eb9
2 parents 4a4940d + 0883533
commit c5f8eb9
Showing 1 changed file with 8 additions and 13 deletions.
diff --git a/targets/spidermonkey/conversions.yaml b/targets/spidermonkey/conversions.yaml
@@ -99,6 +99,9 @@ conversions:
     "Options": "ok &= seval_to_TextureOptions(${in_value}, &${out_value})"
     "SubImageOption": "ok &= seval_to_TextureSubImageOption(${in_value}, &${out_value})"
     "ImageOption": "ok &= seval_to_TextureImageOption(${in_value}, &${out_value})"
+    "String": "${out_value} = ${in_value}.toStringForce().c_str()"
+    "@Vector<spine::String.*>": "ok &= seval_to_spine_Vector_String(${in_value}, &${out_value})"
+    "@Vector<spine::((?!String).)*>": "ok &= seval_to_spine_Vector_T_ptr(${in_value}, &${out_value})"
     object: "ok &= seval_to_native_ptr(${in_value}, &${out_value})"
 
   from_native:
@@ -154,19 +157,6 @@ conversions:
     "Vec4": "ok &= Vec4_to_seval(${in_value}, &${out_value})"
     "BlendFunc": "ok &= blendfunc_to_seval(${in_value}, &${out_value})"
     "Quaternion": "ok &= Quaternion_to_seval(${in_value}, &${out_value})"
-    "spEventData*": "ok &= speventdata_to_seval(${in_value}, &${out_value})"
-    "spEvent*": "ok &= spevent_to_seval(${in_value}, &${out_value})"
-    "spBoneData*": "ok &= spbonedata_to_seval(${in_value}, &${out_value})"
-    "spBone*": "ok &= spbone_to_seval(${in_value}, &${out_value})"
-    "spSkeleton*": "ok &= spskeleton_to_seval(${in_value}, &${out_value})"
-    "spAttachment*": "ok &= spattachment_to_seval(${in_value}, &${out_value})"
-    "spSlotData*": "ok &= spslotdata_to_seval(${in_value}, &${out_value})"
-    "spSlot*": "ok &= spslot_to_seval(${in_value}, &${out_value})"
-    "spTimeline*": "ok &= sptimeline_to_seval(${in_value}, &${out_value})"
-    "spAnimationState*": "ok &= spanimationstate_to_seval(${in_value}, &${out_value})"
-    "spAnimation*": "ok &= spanimation_to_seval(${in_value}, &${out_value})"
-    "spTrackEntry*": "ok &= sptrackentry_to_seval(${in_value}, &${out_value})"
-    "Quaternion": "ok &= Quaternion_to_seval(${in_value}, &${out_value})"
     # "OffMeshLinkData": "${out_value} = offMeshLinkData_to_seval(${in_value})"
     "TouchEventType": "ok &= int32_to_seval((int32_t)${in_value}, &${out_value})"
     "EventType": "ok &= int32_to_seval((int32_t)${in_value}, &${out_value})"
@@ -180,5 +170,10 @@ conversions:
     "b2AABB": "ok &= b2AABB_to_seval(${in_value}, &${out_value})"
     "VertexFormat": "ok &= VertexFormat_to_seval(${in_value}, &${out_value})"
     "se_object_ptr": "${out_value}.setObject(${in_value})"
+    "String":  "${out_value}.setString(${in_value}.buffer())"
+    "@(?:\\bBoneData\\b|\\bSkeleton\\b|\\bColor\\b|\\bEventData\\b|\\bIkConstraintData\\b|\\bPathConstraintData\\b|\\bTransformConstraintData\\b|\\bBone\\b|\\bSlotData\\b)+(?!\\*)+":  "ok &= native_ptr_to_rooted_seval<${ntype.replace('const ', '').replace('&', '')}>((${ntype.replace('const ', '').replace('&', '')}*)&${in_value}, &${out_value})"
+    "@Vector<spine::((?!String).)*>": "ok &= spine_Vector_T_ptr_to_seval(${in_value}, &${out_value})"
+    "@Vector<.*(\\bshort\\b|\\bfloat\\b)+>": "ok &= spine_Vector_T_to_seval(${in_value}, &${out_value})"
+    "@Vector<spine::String.*>": "ok &= spine_Vector_String_to_seval(${in_value}, &${out_value})"
     object: "ok &= native_ptr_to_seval<${ntype.replace('*', '').replace('const ', '')}>((${ntype.replace('const ', '')})${in_value}, &${out_value})"
     rooted_object: "ok &= native_ptr_to_rooted_seval<${ntype.replace('*', '').replace('const ', '')}>((${ntype.replace('const ', '')})${in_value}, &${out_value})"