From cb62bd70c0414960b761d2f6d2accf574edfc97b Mon Sep 17 00:00:00 2001 From: Mario Zechner Date: Wed, 27 Aug 2025 10:58:23 +0200 Subject: [PATCH] feat(spine-ios): Add Objective-C support to generated Swift bindings - Add NSObject inheritance to root classes for ObjC compatibility - Add @objc(Spine) and @objcMembers annotations to all classes - Fix property name conflicts (className -> rttiClassName, hash -> hashString) - Use @nonobjc on subclass initializers to avoid selector conflicts - Fix convenience init override modifiers - Update ObjC example to use new API method names - Update test to use rttiClassName property --- .../SimpleAnimationViewController.m | 6 +- .../SpineSwift/Generated/Animation.swift | 5 +- .../Sources/SpineSwift/Generated/Arrays.swift | 231 ++++++++++++------ .../Sources/SpineSwift/Generated/Atlas.swift | 5 +- .../SpineSwift/Generated/Attachment.swift | 11 +- .../Sources/SpineSwift/Generated/Bone.swift | 3 + .../Sources/SpineSwift/Generated/Color.swift | 7 +- .../Sources/SpineSwift/Generated/Event.swift | 5 +- .../SpineSwift/Generated/Polygon.swift | 7 +- .../Sources/SpineSwift/Generated/Rtti.swift | 7 +- .../SpineSwift/Generated/Sequence.swift | 5 +- .../SpineSwift/Generated/Skeleton.swift | 17 +- .../Sources/SpineSwift/Generated/Skin.swift | 11 +- .../Sources/SpineSwift/Generated/Slider.swift | 3 + .../Sources/SpineSwift/Generated/Slot.swift | 5 +- .../SpineSwift/Generated/Timeline.swift | 5 +- .../SpineSwift/Generated/alpha_timeline.swift | 3 + .../Generated/animation_state.swift | 5 +- .../Generated/animation_state_data.swift | 5 +- .../Generated/atlas_attachment_loader.swift | 5 +- .../SpineSwift/Generated/atlas_page.swift | 5 +- .../SpineSwift/Generated/atlas_region.swift | 3 + .../Generated/attachment_timeline.swift | 3 + .../SpineSwift/Generated/bone_data.swift | 3 + .../SpineSwift/Generated/bone_local.swift | 7 +- .../SpineSwift/Generated/bone_pose.swift | 3 + .../SpineSwift/Generated/bone_timeline1.swift | 3 + .../SpineSwift/Generated/bone_timeline2.swift | 3 + .../Generated/bounding_box_attachment.swift | 3 + .../Generated/clipping_attachment.swift | 3 + .../Generated/constraint_timeline1.swift | 3 + .../SpineSwift/Generated/curve_timeline.swift | 3 + .../Generated/curve_timeline1.swift | 3 + .../Generated/deform_timeline.swift | 9 +- .../Generated/draw_order_timeline.swift | 3 + .../SpineSwift/Generated/event_data.swift | 5 +- .../Generated/event_queue_entry.swift | 5 +- .../SpineSwift/Generated/event_timeline.swift | 3 + .../SpineSwift/Generated/from_property.swift | 5 +- .../SpineSwift/Generated/from_rotate.swift | 3 + .../SpineSwift/Generated/from_scale_x.swift | 3 + .../SpineSwift/Generated/from_scale_y.swift | 3 + .../SpineSwift/Generated/from_shear_y.swift | 3 + .../Sources/SpineSwift/Generated/from_x.swift | 3 + .../Sources/SpineSwift/Generated/from_y.swift | 3 + .../SpineSwift/Generated/ik_constraint.swift | 3 + .../Generated/ik_constraint_data.swift | 9 +- .../Generated/ik_constraint_pose.swift | 7 +- .../Generated/ik_constraint_timeline.swift | 3 + .../Generated/inherit_timeline.swift | 3 + .../Generated/mesh_attachment.swift | 3 + .../Generated/path_attachment.swift | 3 + .../Generated/path_constraint.swift | 3 + .../Generated/path_constraint_data.swift | 9 +- .../path_constraint_mix_timeline.swift | 3 + .../Generated/path_constraint_pose.swift | 7 +- .../path_constraint_position_timeline.swift | 3 + .../path_constraint_spacing_timeline.swift | 3 + .../Generated/physics_constraint.swift | 3 + .../physics_constraint_damping_timeline.swift | 3 + .../Generated/physics_constraint_data.swift | 9 +- .../physics_constraint_gravity_timeline.swift | 3 + .../physics_constraint_inertia_timeline.swift | 3 + .../physics_constraint_mass_timeline.swift | 3 + .../physics_constraint_mix_timeline.swift | 3 + .../Generated/physics_constraint_pose.swift | 7 +- .../physics_constraint_reset_timeline.swift | 3 + ...physics_constraint_strength_timeline.swift | 3 + .../physics_constraint_timeline.swift | 3 + .../physics_constraint_wind_timeline.swift | 3 + .../Generated/point_attachment.swift | 3 + .../SpineSwift/Generated/posed_active.swift | 5 +- .../SpineSwift/Generated/posed_data.swift | 5 +- .../Generated/region_attachment.swift | 3 + .../SpineSwift/Generated/render_command.swift | 5 +- .../SpineSwift/Generated/rgb2_timeline.swift | 3 + .../SpineSwift/Generated/rgb_timeline.swift | 3 + .../SpineSwift/Generated/rgba2_timeline.swift | 3 + .../SpineSwift/Generated/rgba_timeline.swift | 3 + .../Generated/rotate_timeline.swift | 3 + .../SpineSwift/Generated/scale_timeline.swift | 3 + .../Generated/scale_x_timeline.swift | 3 + .../Generated/scale_y_timeline.swift | 3 + .../Generated/sequence_timeline.swift | 9 +- .../SpineSwift/Generated/shear_timeline.swift | 3 + .../Generated/shear_x_timeline.swift | 3 + .../Generated/shear_y_timeline.swift | 3 + .../Generated/skeleton_binary.swift | 5 +- .../Generated/skeleton_bounds.swift | 7 +- .../Generated/skeleton_clipping.swift | 7 +- .../SpineSwift/Generated/skeleton_data.swift | 9 +- .../SpineSwift/Generated/skeleton_json.swift | 5 +- .../Generated/skeleton_renderer.swift | 7 +- .../SpineSwift/Generated/slider_data.swift | 15 +- .../Generated/slider_mix_timeline.swift | 3 + .../SpineSwift/Generated/slider_pose.swift | 7 +- .../Generated/slider_timeline.swift | 3 + .../Generated/slot_curve_timeline.swift | 3 + .../SpineSwift/Generated/slot_data.swift | 3 + .../SpineSwift/Generated/slot_pose.swift | 13 +- .../SpineSwift/Generated/texture_region.swift | 7 +- .../SpineSwift/Generated/to_property.swift | 5 +- .../SpineSwift/Generated/to_rotate.swift | 3 + .../SpineSwift/Generated/to_scale_x.swift | 3 + .../SpineSwift/Generated/to_scale_y.swift | 3 + .../SpineSwift/Generated/to_shear_y.swift | 3 + .../Sources/SpineSwift/Generated/to_x.swift | 3 + .../Sources/SpineSwift/Generated/to_y.swift | 3 + .../SpineSwift/Generated/track_entry.swift | 7 +- .../Generated/transform_constraint.swift | 3 + .../Generated/transform_constraint_data.swift | 9 +- .../Generated/transform_constraint_pose.swift | 7 +- .../transform_constraint_timeline.swift | 3 + .../Generated/translate_timeline.swift | 3 + .../Generated/translate_x_timeline.swift | 3 + .../Generated/translate_y_timeline.swift | 3 + .../Generated/vertex_attachment.swift | 9 +- spine-ios/codegen/src/swift-writer.ts | 54 +++- .../src/skeleton_drawable_test_swift.swift | 2 +- 119 files changed, 645 insertions(+), 187 deletions(-) diff --git a/spine-ios/Example/Spine iOS Example/SimpleAnimationViewController.m b/spine-ios/Example/Spine iOS Example/SimpleAnimationViewController.m index aa4c71de5..3f96e2a21 100644 --- a/spine-ios/Example/Spine iOS Example/SimpleAnimationViewController.m +++ b/spine-ios/Example/Spine iOS Example/SimpleAnimationViewController.m @@ -42,7 +42,7 @@ self = [super init]; if (self) { self.spineController = [[SpineController alloc] initOnInitialized:^(SpineController *controller) { - [controller.animationState setAnimationByNameWithTrackIndex:0 animationName:@"walk" loop:YES]; + [controller.animationState setAnimation:0 :@"walk" :YES]; } onBeforeUpdateWorldTransforms:nil onAfterUpdateWorldTransforms:nil @@ -60,8 +60,8 @@ skeletonFileName:@"spineboy-pro.skel" bundle:[NSBundle mainBundle] controller:self.spineController - mode:ContentModeFit - alignment:AlignmentCenter + mode:SpineContentModeFit + alignment:SpineAlignmentCenter boundsProvider:[[SpineSetupPoseBounds alloc] init] backgroundColor:[UIColor clearColor]]; spineView.frame = self.view.bounds; diff --git a/spine-ios/Sources/SpineSwift/Generated/Animation.swift b/spine-ios/Sources/SpineSwift/Generated/Animation.swift index d3a1477de..01f4270d2 100644 --- a/spine-ios/Sources/SpineSwift/Generated/Animation.swift +++ b/spine-ios/Sources/SpineSwift/Generated/Animation.swift @@ -33,11 +33,14 @@ import Foundation import SpineC /// Animation wrapper -public class Animation { +@objc(SpineAnimation) +@objcMembers +public class Animation: NSObject { public let _ptr: UnsafeMutableRawPointer public init(fromPointer ptr: spine_animation) { self._ptr = UnsafeMutableRawPointer(ptr) + super.init() } public convenience init(_ name: String, _ timelines: ArrayTimeline, _ duration: Float) { diff --git a/spine-ios/Sources/SpineSwift/Generated/Arrays.swift b/spine-ios/Sources/SpineSwift/Generated/Arrays.swift index 6f7c2ba80..e75d8aa6e 100644 --- a/spine-ios/Sources/SpineSwift/Generated/Arrays.swift +++ b/spine-ios/Sources/SpineSwift/Generated/Arrays.swift @@ -33,18 +33,21 @@ import Foundation import SpineC /// ArrayFloat wrapper -public class ArrayFloat { +@objc(SpineArrayFloat) +@objcMembers +public class ArrayFloat: NSObject { public let _ptr: UnsafeMutableRawPointer private let _ownsMemory: Bool public init(fromPointer ptr: spine_array_float, ownsMemory: Bool = false) { self._ptr = UnsafeMutableRawPointer(ptr) self._ownsMemory = ownsMemory + super.init() } /// Create a new empty array - public convenience init() { + public override convenience init() { let ptr = spine_array_float_create()! self.init(fromPointer: ptr, ownsMemory: true) } @@ -107,18 +110,21 @@ public class ArrayFloat { } /// ArrayInt wrapper -public class ArrayInt { +@objc(SpineArrayInt) +@objcMembers +public class ArrayInt: NSObject { public let _ptr: UnsafeMutableRawPointer private let _ownsMemory: Bool public init(fromPointer ptr: spine_array_int, ownsMemory: Bool = false) { self._ptr = UnsafeMutableRawPointer(ptr) self._ownsMemory = ownsMemory + super.init() } /// Create a new empty array - public convenience init() { + public override convenience init() { let ptr = spine_array_int_create()! self.init(fromPointer: ptr, ownsMemory: true) } @@ -181,18 +187,21 @@ public class ArrayInt { } /// ArrayUnsignedShort wrapper -public class ArrayUnsignedShort { +@objc(SpineArrayUnsignedShort) +@objcMembers +public class ArrayUnsignedShort: NSObject { public let _ptr: UnsafeMutableRawPointer private let _ownsMemory: Bool public init(fromPointer ptr: spine_array_unsigned_short, ownsMemory: Bool = false) { self._ptr = UnsafeMutableRawPointer(ptr) self._ownsMemory = ownsMemory + super.init() } /// Create a new empty array - public convenience init() { + public override convenience init() { let ptr = spine_array_unsigned_short_create()! self.init(fromPointer: ptr, ownsMemory: true) } @@ -255,18 +264,21 @@ public class ArrayUnsignedShort { } /// ArrayPropertyId wrapper -public class ArrayPropertyId { +@objc(SpineArrayPropertyId) +@objcMembers +public class ArrayPropertyId: NSObject { public let _ptr: UnsafeMutableRawPointer private let _ownsMemory: Bool public init(fromPointer ptr: spine_array_property_id, ownsMemory: Bool = false) { self._ptr = UnsafeMutableRawPointer(ptr) self._ownsMemory = ownsMemory + super.init() } /// Create a new empty array - public convenience init() { + public override convenience init() { let ptr = spine_array_property_id_create()! self.init(fromPointer: ptr, ownsMemory: true) } @@ -329,18 +341,21 @@ public class ArrayPropertyId { } /// ArrayAnimation wrapper -public class ArrayAnimation { +@objc(SpineArrayAnimation) +@objcMembers +public class ArrayAnimation: NSObject { public let _ptr: UnsafeMutableRawPointer private let _ownsMemory: Bool public init(fromPointer ptr: spine_array_animation, ownsMemory: Bool = false) { self._ptr = UnsafeMutableRawPointer(ptr) self._ownsMemory = ownsMemory + super.init() } /// Create a new empty array - public convenience init() { + public override convenience init() { let ptr = spine_array_animation_create()! self.init(fromPointer: ptr, ownsMemory: true) } @@ -404,18 +419,21 @@ public class ArrayAnimation { } /// ArrayAtlasPage wrapper -public class ArrayAtlasPage { +@objc(SpineArrayAtlasPage) +@objcMembers +public class ArrayAtlasPage: NSObject { public let _ptr: UnsafeMutableRawPointer private let _ownsMemory: Bool public init(fromPointer ptr: spine_array_atlas_page, ownsMemory: Bool = false) { self._ptr = UnsafeMutableRawPointer(ptr) self._ownsMemory = ownsMemory + super.init() } /// Create a new empty array - public convenience init() { + public override convenience init() { let ptr = spine_array_atlas_page_create()! self.init(fromPointer: ptr, ownsMemory: true) } @@ -479,18 +497,21 @@ public class ArrayAtlasPage { } /// ArrayAtlasRegion wrapper -public class ArrayAtlasRegion { +@objc(SpineArrayAtlasRegion) +@objcMembers +public class ArrayAtlasRegion: NSObject { public let _ptr: UnsafeMutableRawPointer private let _ownsMemory: Bool public init(fromPointer ptr: spine_array_atlas_region, ownsMemory: Bool = false) { self._ptr = UnsafeMutableRawPointer(ptr) self._ownsMemory = ownsMemory + super.init() } /// Create a new empty array - public convenience init() { + public override convenience init() { let ptr = spine_array_atlas_region_create()! self.init(fromPointer: ptr, ownsMemory: true) } @@ -554,18 +575,21 @@ public class ArrayAtlasRegion { } /// ArrayAttachment wrapper -public class ArrayAttachment { +@objc(SpineArrayAttachment) +@objcMembers +public class ArrayAttachment: NSObject { public let _ptr: UnsafeMutableRawPointer private let _ownsMemory: Bool public init(fromPointer ptr: spine_array_attachment, ownsMemory: Bool = false) { self._ptr = UnsafeMutableRawPointer(ptr) self._ownsMemory = ownsMemory + super.init() } /// Create a new empty array - public convenience init() { + public override convenience init() { let ptr = spine_array_attachment_create()! self.init(fromPointer: ptr, ownsMemory: true) } @@ -587,8 +611,8 @@ public class ArrayAttachment { let elementPtr = buffer[Int(index)] guard let ptr = elementPtr else { return nil } let rtti = spine_attachment_get_rtti(ptr) - let className = String(cString: spine_rtti_get_class_name(rtti)!) - switch className { + let rttiClassName = String(cString: spine_rtti_get_class_name(rtti)!) + switch rttiClassName { case "spine_bounding_box_attachment": return BoundingBoxAttachment(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_bounding_box_attachment_wrapper.self)) case "spine_clipping_attachment": @@ -602,7 +626,7 @@ public class ArrayAttachment { case "spine_region_attachment": return RegionAttachment(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_region_attachment_wrapper.self)) default: - fatalError("Unknown concrete type: \(className) for abstract class Attachment") + fatalError("Unknown concrete type: \(rttiClassName) for abstract class Attachment") } } } @@ -647,18 +671,21 @@ public class ArrayAttachment { } /// ArrayBone wrapper -public class ArrayBone { +@objc(SpineArrayBone) +@objcMembers +public class ArrayBone: NSObject { public let _ptr: UnsafeMutableRawPointer private let _ownsMemory: Bool public init(fromPointer ptr: spine_array_bone, ownsMemory: Bool = false) { self._ptr = UnsafeMutableRawPointer(ptr) self._ownsMemory = ownsMemory + super.init() } /// Create a new empty array - public convenience init() { + public override convenience init() { let ptr = spine_array_bone_create()! self.init(fromPointer: ptr, ownsMemory: true) } @@ -722,18 +749,21 @@ public class ArrayBone { } /// ArrayBoneData wrapper -public class ArrayBoneData { +@objc(SpineArrayBoneData) +@objcMembers +public class ArrayBoneData: NSObject { public let _ptr: UnsafeMutableRawPointer private let _ownsMemory: Bool public init(fromPointer ptr: spine_array_bone_data, ownsMemory: Bool = false) { self._ptr = UnsafeMutableRawPointer(ptr) self._ownsMemory = ownsMemory + super.init() } /// Create a new empty array - public convenience init() { + public override convenience init() { let ptr = spine_array_bone_data_create()! self.init(fromPointer: ptr, ownsMemory: true) } @@ -797,18 +827,21 @@ public class ArrayBoneData { } /// ArrayBonePose wrapper -public class ArrayBonePose { +@objc(SpineArrayBonePose) +@objcMembers +public class ArrayBonePose: NSObject { public let _ptr: UnsafeMutableRawPointer private let _ownsMemory: Bool public init(fromPointer ptr: spine_array_bone_pose, ownsMemory: Bool = false) { self._ptr = UnsafeMutableRawPointer(ptr) self._ownsMemory = ownsMemory + super.init() } /// Create a new empty array - public convenience init() { + public override convenience init() { let ptr = spine_array_bone_pose_create()! self.init(fromPointer: ptr, ownsMemory: true) } @@ -872,18 +905,21 @@ public class ArrayBonePose { } /// ArrayBoundingBoxAttachment wrapper -public class ArrayBoundingBoxAttachment { +@objc(SpineArrayBoundingBoxAttachment) +@objcMembers +public class ArrayBoundingBoxAttachment: NSObject { public let _ptr: UnsafeMutableRawPointer private let _ownsMemory: Bool public init(fromPointer ptr: spine_array_bounding_box_attachment, ownsMemory: Bool = false) { self._ptr = UnsafeMutableRawPointer(ptr) self._ownsMemory = ownsMemory + super.init() } /// Create a new empty array - public convenience init() { + public override convenience init() { let ptr = spine_array_bounding_box_attachment_create()! self.init(fromPointer: ptr, ownsMemory: true) } @@ -947,18 +983,21 @@ public class ArrayBoundingBoxAttachment { } /// ArrayConstraint wrapper -public class ArrayConstraint { +@objc(SpineArrayConstraint) +@objcMembers +public class ArrayConstraint: NSObject { public let _ptr: UnsafeMutableRawPointer private let _ownsMemory: Bool public init(fromPointer ptr: spine_array_constraint, ownsMemory: Bool = false) { self._ptr = UnsafeMutableRawPointer(ptr) self._ownsMemory = ownsMemory + super.init() } /// Create a new empty array - public convenience init() { + public override convenience init() { let ptr = spine_array_constraint_create()! self.init(fromPointer: ptr, ownsMemory: true) } @@ -980,8 +1019,8 @@ public class ArrayConstraint { let elementPtr = buffer[Int(index)] guard let ptr = elementPtr else { return nil } let rtti = spine_constraint_get_rtti(ptr) - let className = String(cString: spine_rtti_get_class_name(rtti)!) - switch className { + let rttiClassName = String(cString: spine_rtti_get_class_name(rtti)!) + switch rttiClassName { case "spine_ik_constraint": return IkConstraint(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_ik_constraint_wrapper.self)) case "spine_path_constraint": @@ -993,7 +1032,7 @@ public class ArrayConstraint { case "spine_transform_constraint": return TransformConstraint(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_transform_constraint_wrapper.self)) default: - fatalError("Unknown concrete type: \(className) for abstract class Constraint") + fatalError("Unknown concrete type: \(rttiClassName) for abstract class Constraint") } } } @@ -1038,18 +1077,21 @@ public class ArrayConstraint { } /// ArrayConstraintData wrapper -public class ArrayConstraintData { +@objc(SpineArrayConstraintData) +@objcMembers +public class ArrayConstraintData: NSObject { public let _ptr: UnsafeMutableRawPointer private let _ownsMemory: Bool public init(fromPointer ptr: spine_array_constraint_data, ownsMemory: Bool = false) { self._ptr = UnsafeMutableRawPointer(ptr) self._ownsMemory = ownsMemory + super.init() } /// Create a new empty array - public convenience init() { + public override convenience init() { let ptr = spine_array_constraint_data_create()! self.init(fromPointer: ptr, ownsMemory: true) } @@ -1071,8 +1113,8 @@ public class ArrayConstraintData { let elementPtr = buffer[Int(index)] guard let ptr = elementPtr else { return nil } let rtti = spine_constraint_data_get_rtti(ptr) - let className = String(cString: spine_rtti_get_class_name(rtti)!) - switch className { + let rttiClassName = String(cString: spine_rtti_get_class_name(rtti)!) + switch rttiClassName { case "spine_ik_constraint_data": return IkConstraintData(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_ik_constraint_data_wrapper.self)) case "spine_path_constraint_data": @@ -1084,7 +1126,7 @@ public class ArrayConstraintData { case "spine_transform_constraint_data": return TransformConstraintData(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_transform_constraint_data_wrapper.self)) default: - fatalError("Unknown concrete type: \(className) for abstract class ConstraintData") + fatalError("Unknown concrete type: \(rttiClassName) for abstract class ConstraintData") } } } @@ -1129,18 +1171,21 @@ public class ArrayConstraintData { } /// ArrayEvent wrapper -public class ArrayEvent { +@objc(SpineArrayEvent) +@objcMembers +public class ArrayEvent: NSObject { public let _ptr: UnsafeMutableRawPointer private let _ownsMemory: Bool public init(fromPointer ptr: spine_array_event, ownsMemory: Bool = false) { self._ptr = UnsafeMutableRawPointer(ptr) self._ownsMemory = ownsMemory + super.init() } /// Create a new empty array - public convenience init() { + public override convenience init() { let ptr = spine_array_event_create()! self.init(fromPointer: ptr, ownsMemory: true) } @@ -1204,18 +1249,21 @@ public class ArrayEvent { } /// ArrayEventData wrapper -public class ArrayEventData { +@objc(SpineArrayEventData) +@objcMembers +public class ArrayEventData: NSObject { public let _ptr: UnsafeMutableRawPointer private let _ownsMemory: Bool public init(fromPointer ptr: spine_array_event_data, ownsMemory: Bool = false) { self._ptr = UnsafeMutableRawPointer(ptr) self._ownsMemory = ownsMemory + super.init() } /// Create a new empty array - public convenience init() { + public override convenience init() { let ptr = spine_array_event_data_create()! self.init(fromPointer: ptr, ownsMemory: true) } @@ -1279,18 +1327,21 @@ public class ArrayEventData { } /// ArrayFromProperty wrapper -public class ArrayFromProperty { +@objc(SpineArrayFromProperty) +@objcMembers +public class ArrayFromProperty: NSObject { public let _ptr: UnsafeMutableRawPointer private let _ownsMemory: Bool public init(fromPointer ptr: spine_array_from_property, ownsMemory: Bool = false) { self._ptr = UnsafeMutableRawPointer(ptr) self._ownsMemory = ownsMemory + super.init() } /// Create a new empty array - public convenience init() { + public override convenience init() { let ptr = spine_array_from_property_create()! self.init(fromPointer: ptr, ownsMemory: true) } @@ -1312,8 +1363,8 @@ public class ArrayFromProperty { let elementPtr = buffer[Int(index)] guard let ptr = elementPtr else { return nil } let rtti = spine_from_property_get_rtti(ptr) - let className = String(cString: spine_rtti_get_class_name(rtti)!) - switch className { + let rttiClassName = String(cString: spine_rtti_get_class_name(rtti)!) + switch rttiClassName { case "spine_from_rotate": return FromRotate(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_from_rotate_wrapper.self)) case "spine_from_scale_x": @@ -1327,7 +1378,7 @@ public class ArrayFromProperty { case "spine_from_y": return FromY(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_from_y_wrapper.self)) default: - fatalError("Unknown concrete type: \(className) for abstract class FromProperty") + fatalError("Unknown concrete type: \(rttiClassName) for abstract class FromProperty") } } } @@ -1372,18 +1423,21 @@ public class ArrayFromProperty { } /// ArrayPhysicsConstraint wrapper -public class ArrayPhysicsConstraint { +@objc(SpineArrayPhysicsConstraint) +@objcMembers +public class ArrayPhysicsConstraint: NSObject { public let _ptr: UnsafeMutableRawPointer private let _ownsMemory: Bool public init(fromPointer ptr: spine_array_physics_constraint, ownsMemory: Bool = false) { self._ptr = UnsafeMutableRawPointer(ptr) self._ownsMemory = ownsMemory + super.init() } /// Create a new empty array - public convenience init() { + public override convenience init() { let ptr = spine_array_physics_constraint_create()! self.init(fromPointer: ptr, ownsMemory: true) } @@ -1447,18 +1501,21 @@ public class ArrayPhysicsConstraint { } /// ArrayPolygon wrapper -public class ArrayPolygon { +@objc(SpineArrayPolygon) +@objcMembers +public class ArrayPolygon: NSObject { public let _ptr: UnsafeMutableRawPointer private let _ownsMemory: Bool public init(fromPointer ptr: spine_array_polygon, ownsMemory: Bool = false) { self._ptr = UnsafeMutableRawPointer(ptr) self._ownsMemory = ownsMemory + super.init() } /// Create a new empty array - public convenience init() { + public override convenience init() { let ptr = spine_array_polygon_create()! self.init(fromPointer: ptr, ownsMemory: true) } @@ -1522,18 +1579,21 @@ public class ArrayPolygon { } /// ArraySkin wrapper -public class ArraySkin { +@objc(SpineArraySkin) +@objcMembers +public class ArraySkin: NSObject { public let _ptr: UnsafeMutableRawPointer private let _ownsMemory: Bool public init(fromPointer ptr: spine_array_skin, ownsMemory: Bool = false) { self._ptr = UnsafeMutableRawPointer(ptr) self._ownsMemory = ownsMemory + super.init() } /// Create a new empty array - public convenience init() { + public override convenience init() { let ptr = spine_array_skin_create()! self.init(fromPointer: ptr, ownsMemory: true) } @@ -1597,18 +1657,21 @@ public class ArraySkin { } /// ArraySlot wrapper -public class ArraySlot { +@objc(SpineArraySlot) +@objcMembers +public class ArraySlot: NSObject { public let _ptr: UnsafeMutableRawPointer private let _ownsMemory: Bool public init(fromPointer ptr: spine_array_slot, ownsMemory: Bool = false) { self._ptr = UnsafeMutableRawPointer(ptr) self._ownsMemory = ownsMemory + super.init() } /// Create a new empty array - public convenience init() { + public override convenience init() { let ptr = spine_array_slot_create()! self.init(fromPointer: ptr, ownsMemory: true) } @@ -1672,18 +1735,21 @@ public class ArraySlot { } /// ArraySlotData wrapper -public class ArraySlotData { +@objc(SpineArraySlotData) +@objcMembers +public class ArraySlotData: NSObject { public let _ptr: UnsafeMutableRawPointer private let _ownsMemory: Bool public init(fromPointer ptr: spine_array_slot_data, ownsMemory: Bool = false) { self._ptr = UnsafeMutableRawPointer(ptr) self._ownsMemory = ownsMemory + super.init() } /// Create a new empty array - public convenience init() { + public override convenience init() { let ptr = spine_array_slot_data_create()! self.init(fromPointer: ptr, ownsMemory: true) } @@ -1747,18 +1813,21 @@ public class ArraySlotData { } /// ArrayTextureRegion wrapper -public class ArrayTextureRegion { +@objc(SpineArrayTextureRegion) +@objcMembers +public class ArrayTextureRegion: NSObject { public let _ptr: UnsafeMutableRawPointer private let _ownsMemory: Bool public init(fromPointer ptr: spine_array_texture_region, ownsMemory: Bool = false) { self._ptr = UnsafeMutableRawPointer(ptr) self._ownsMemory = ownsMemory + super.init() } /// Create a new empty array - public convenience init() { + public override convenience init() { let ptr = spine_array_texture_region_create()! self.init(fromPointer: ptr, ownsMemory: true) } @@ -1822,18 +1891,21 @@ public class ArrayTextureRegion { } /// ArrayTimeline wrapper -public class ArrayTimeline { +@objc(SpineArrayTimeline) +@objcMembers +public class ArrayTimeline: NSObject { public let _ptr: UnsafeMutableRawPointer private let _ownsMemory: Bool public init(fromPointer ptr: spine_array_timeline, ownsMemory: Bool = false) { self._ptr = UnsafeMutableRawPointer(ptr) self._ownsMemory = ownsMemory + super.init() } /// Create a new empty array - public convenience init() { + public override convenience init() { let ptr = spine_array_timeline_create()! self.init(fromPointer: ptr, ownsMemory: true) } @@ -1855,8 +1927,8 @@ public class ArrayTimeline { let elementPtr = buffer[Int(index)] guard let ptr = elementPtr else { return nil } let rtti = spine_timeline_get_rtti(ptr) - let className = String(cString: spine_rtti_get_class_name(rtti)!) - switch className { + let rttiClassName = String(cString: spine_rtti_get_class_name(rtti)!) + switch rttiClassName { case "spine_alpha_timeline": return AlphaTimeline(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_alpha_timeline_wrapper.self)) case "spine_attachment_timeline": @@ -1930,7 +2002,7 @@ public class ArrayTimeline { case "spine_translate_y_timeline": return TranslateYTimeline(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_translate_y_timeline_wrapper.self)) default: - fatalError("Unknown concrete type: \(className) for abstract class Timeline") + fatalError("Unknown concrete type: \(rttiClassName) for abstract class Timeline") } } } @@ -1975,18 +2047,21 @@ public class ArrayTimeline { } /// ArrayToProperty wrapper -public class ArrayToProperty { +@objc(SpineArrayToProperty) +@objcMembers +public class ArrayToProperty: NSObject { public let _ptr: UnsafeMutableRawPointer private let _ownsMemory: Bool public init(fromPointer ptr: spine_array_to_property, ownsMemory: Bool = false) { self._ptr = UnsafeMutableRawPointer(ptr) self._ownsMemory = ownsMemory + super.init() } /// Create a new empty array - public convenience init() { + public override convenience init() { let ptr = spine_array_to_property_create()! self.init(fromPointer: ptr, ownsMemory: true) } @@ -2008,8 +2083,8 @@ public class ArrayToProperty { let elementPtr = buffer[Int(index)] guard let ptr = elementPtr else { return nil } let rtti = spine_to_property_get_rtti(ptr) - let className = String(cString: spine_rtti_get_class_name(rtti)!) - switch className { + let rttiClassName = String(cString: spine_rtti_get_class_name(rtti)!) + switch rttiClassName { case "spine_to_rotate": return ToRotate(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_to_rotate_wrapper.self)) case "spine_to_scale_x": @@ -2023,7 +2098,7 @@ public class ArrayToProperty { case "spine_to_y": return ToY(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_to_y_wrapper.self)) default: - fatalError("Unknown concrete type: \(className) for abstract class ToProperty") + fatalError("Unknown concrete type: \(rttiClassName) for abstract class ToProperty") } } } @@ -2068,18 +2143,21 @@ public class ArrayToProperty { } /// ArrayTrackEntry wrapper -public class ArrayTrackEntry { +@objc(SpineArrayTrackEntry) +@objcMembers +public class ArrayTrackEntry: NSObject { public let _ptr: UnsafeMutableRawPointer private let _ownsMemory: Bool public init(fromPointer ptr: spine_array_track_entry, ownsMemory: Bool = false) { self._ptr = UnsafeMutableRawPointer(ptr) self._ownsMemory = ownsMemory + super.init() } /// Create a new empty array - public convenience init() { + public override convenience init() { let ptr = spine_array_track_entry_create()! self.init(fromPointer: ptr, ownsMemory: true) } @@ -2143,18 +2221,21 @@ public class ArrayTrackEntry { } /// ArrayUpdate wrapper -public class ArrayUpdate { +@objc(SpineArrayUpdate) +@objcMembers +public class ArrayUpdate: NSObject { public let _ptr: UnsafeMutableRawPointer private let _ownsMemory: Bool public init(fromPointer ptr: spine_array_update, ownsMemory: Bool = false) { self._ptr = UnsafeMutableRawPointer(ptr) self._ownsMemory = ownsMemory + super.init() } /// Create a new empty array - public convenience init() { + public override convenience init() { let ptr = spine_array_update_create()! self.init(fromPointer: ptr, ownsMemory: true) } @@ -2176,8 +2257,8 @@ public class ArrayUpdate { let elementPtr = buffer[Int(index)] guard let ptr = elementPtr else { return nil } let rtti = spine_update_get_rtti(ptr) - let className = String(cString: spine_rtti_get_class_name(rtti)!) - switch className { + let rttiClassName = String(cString: spine_rtti_get_class_name(rtti)!) + switch rttiClassName { case "spine_bone": return Bone(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_bone_wrapper.self)) case "spine_bone_pose": @@ -2193,7 +2274,7 @@ public class ArrayUpdate { case "spine_transform_constraint": return TransformConstraint(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_transform_constraint_wrapper.self)) default: - fatalError("Unknown concrete type: \(className) for abstract class Update") + fatalError("Unknown concrete type: \(rttiClassName) for abstract class Update") } } } diff --git a/spine-ios/Sources/SpineSwift/Generated/Atlas.swift b/spine-ios/Sources/SpineSwift/Generated/Atlas.swift index 5d24d2d21..57d113f98 100644 --- a/spine-ios/Sources/SpineSwift/Generated/Atlas.swift +++ b/spine-ios/Sources/SpineSwift/Generated/Atlas.swift @@ -33,11 +33,14 @@ import Foundation import SpineC /// Atlas wrapper -public class Atlas { +@objc(SpineAtlas) +@objcMembers +public class Atlas: NSObject { public let _ptr: UnsafeMutableRawPointer public init(fromPointer ptr: spine_atlas) { self._ptr = UnsafeMutableRawPointer(ptr) + super.init() } public var pages: ArrayAtlasPage { diff --git a/spine-ios/Sources/SpineSwift/Generated/Attachment.swift b/spine-ios/Sources/SpineSwift/Generated/Attachment.swift index 9fbbb5ff5..de7f88504 100644 --- a/spine-ios/Sources/SpineSwift/Generated/Attachment.swift +++ b/spine-ios/Sources/SpineSwift/Generated/Attachment.swift @@ -33,11 +33,14 @@ import Foundation import SpineC /// Attachment wrapper -open class Attachment { +@objc(SpineAttachment) +@objcMembers +open class Attachment: NSObject { public let _ptr: UnsafeMutableRawPointer public init(fromPointer ptr: spine_attachment) { self._ptr = UnsafeMutableRawPointer(ptr) + super.init() } public var rtti: Rtti { @@ -58,8 +61,8 @@ open class Attachment { public func copyAttachment() -> Attachment { let result = spine_attachment_copy(_ptr.assumingMemoryBound(to: spine_attachment_wrapper.self)) let rtti = spine_attachment_get_rtti(result!) - let className = String(cString: spine_rtti_get_class_name(rtti)!) - switch className { + let rttiClassName = String(cString: spine_rtti_get_class_name(rtti)!) + switch rttiClassName { case "spine_bounding_box_attachment": return BoundingBoxAttachment(fromPointer: UnsafeMutableRawPointer(result!).assumingMemoryBound(to: spine_bounding_box_attachment_wrapper.self)) case "spine_clipping_attachment": @@ -73,7 +76,7 @@ open class Attachment { case "spine_region_attachment": return RegionAttachment(fromPointer: UnsafeMutableRawPointer(result!).assumingMemoryBound(to: spine_region_attachment_wrapper.self)) default: - fatalError("Unknown concrete type: \(className) for abstract class Attachment") + fatalError("Unknown concrete type: \(rttiClassName) for abstract class Attachment") } } diff --git a/spine-ios/Sources/SpineSwift/Generated/Bone.swift b/spine-ios/Sources/SpineSwift/Generated/Bone.swift index 868bb1e5a..e979b6c8d 100644 --- a/spine-ios/Sources/SpineSwift/Generated/Bone.swift +++ b/spine-ios/Sources/SpineSwift/Generated/Bone.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// Bone wrapper +@objc(SpineBone) +@objcMembers public class Bone: PosedActive, Posed, Update { + @nonobjc public init(fromPointer ptr: spine_bone) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_posed_active_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/Color.swift b/spine-ios/Sources/SpineSwift/Generated/Color.swift index be6f80a6f..defad1351 100644 --- a/spine-ios/Sources/SpineSwift/Generated/Color.swift +++ b/spine-ios/Sources/SpineSwift/Generated/Color.swift @@ -33,14 +33,17 @@ import Foundation import SpineC /// Color wrapper -public class Color { +@objc(SpineColor) +@objcMembers +public class Color: NSObject { public let _ptr: UnsafeMutableRawPointer public init(fromPointer ptr: spine_color) { self._ptr = UnsafeMutableRawPointer(ptr) + super.init() } - public convenience init() { + public override convenience init() { let ptr = spine_color_create() self.init(fromPointer: ptr!) } diff --git a/spine-ios/Sources/SpineSwift/Generated/Event.swift b/spine-ios/Sources/SpineSwift/Generated/Event.swift index b0c0abde0..ed57cee51 100644 --- a/spine-ios/Sources/SpineSwift/Generated/Event.swift +++ b/spine-ios/Sources/SpineSwift/Generated/Event.swift @@ -33,11 +33,14 @@ import Foundation import SpineC /// Event wrapper -public class Event { +@objc(SpineEvent) +@objcMembers +public class Event: NSObject { public let _ptr: UnsafeMutableRawPointer public init(fromPointer ptr: spine_event) { self._ptr = UnsafeMutableRawPointer(ptr) + super.init() } public convenience init(_ time: Float, _ data: EventData) { diff --git a/spine-ios/Sources/SpineSwift/Generated/Polygon.swift b/spine-ios/Sources/SpineSwift/Generated/Polygon.swift index f312dc523..1c2fb772e 100644 --- a/spine-ios/Sources/SpineSwift/Generated/Polygon.swift +++ b/spine-ios/Sources/SpineSwift/Generated/Polygon.swift @@ -33,14 +33,17 @@ import Foundation import SpineC /// Polygon wrapper -public class Polygon { +@objc(SpinePolygon) +@objcMembers +public class Polygon: NSObject { public let _ptr: UnsafeMutableRawPointer public init(fromPointer ptr: spine_polygon) { self._ptr = UnsafeMutableRawPointer(ptr) + super.init() } - public convenience init() { + public override convenience init() { let ptr = spine_polygon_create() self.init(fromPointer: ptr!) } diff --git a/spine-ios/Sources/SpineSwift/Generated/Rtti.swift b/spine-ios/Sources/SpineSwift/Generated/Rtti.swift index 8d0a018d5..934acd7e5 100644 --- a/spine-ios/Sources/SpineSwift/Generated/Rtti.swift +++ b/spine-ios/Sources/SpineSwift/Generated/Rtti.swift @@ -33,14 +33,17 @@ import Foundation import SpineC /// Rtti wrapper -public class Rtti { +@objc(SpineRtti) +@objcMembers +public class Rtti: NSObject { public let _ptr: UnsafeMutableRawPointer public init(fromPointer ptr: spine_rtti) { self._ptr = UnsafeMutableRawPointer(ptr) + super.init() } - public var className: String? { + public var rttiClassName: String? { let result = spine_rtti_get_class_name(_ptr.assumingMemoryBound(to: spine_rtti_wrapper.self)) return result.map { String(cString: $0) } } diff --git a/spine-ios/Sources/SpineSwift/Generated/Sequence.swift b/spine-ios/Sources/SpineSwift/Generated/Sequence.swift index 2d233a027..a402bae8f 100644 --- a/spine-ios/Sources/SpineSwift/Generated/Sequence.swift +++ b/spine-ios/Sources/SpineSwift/Generated/Sequence.swift @@ -33,11 +33,14 @@ import Foundation import SpineC /// Sequence wrapper -public class Sequence { +@objc(SpineSequence) +@objcMembers +public class Sequence: NSObject { public let _ptr: UnsafeMutableRawPointer public init(fromPointer ptr: spine_sequence) { self._ptr = UnsafeMutableRawPointer(ptr) + super.init() } public convenience init(_ count: Int32) { diff --git a/spine-ios/Sources/SpineSwift/Generated/Skeleton.swift b/spine-ios/Sources/SpineSwift/Generated/Skeleton.swift index ff0c24fb3..5bc8b64e3 100644 --- a/spine-ios/Sources/SpineSwift/Generated/Skeleton.swift +++ b/spine-ios/Sources/SpineSwift/Generated/Skeleton.swift @@ -33,11 +33,14 @@ import Foundation import SpineC /// Skeleton wrapper -public class Skeleton { +@objc(SpineSkeleton) +@objcMembers +public class Skeleton: NSObject { public let _ptr: UnsafeMutableRawPointer public init(fromPointer ptr: spine_skeleton) { self._ptr = UnsafeMutableRawPointer(ptr) + super.init() } public convenience init(_ skeletonData: SkeletonData) { @@ -274,8 +277,8 @@ public class Skeleton { let result = spine_skeleton_get_attachment_1(_ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self), slotName, attachmentName) guard let ptr = result else { return nil } let rtti = spine_attachment_get_rtti(ptr) - let className = String(cString: spine_rtti_get_class_name(rtti)!) - switch className { + let rttiClassName = String(cString: spine_rtti_get_class_name(rtti)!) + switch rttiClassName { case "spine_bounding_box_attachment": return BoundingBoxAttachment(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_bounding_box_attachment_wrapper.self)) case "spine_clipping_attachment": @@ -289,7 +292,7 @@ public class Skeleton { case "spine_region_attachment": return RegionAttachment(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_region_attachment_wrapper.self)) default: - fatalError("Unknown concrete type: \(className) for abstract class Attachment") + fatalError("Unknown concrete type: \(rttiClassName) for abstract class Attachment") } } @@ -297,8 +300,8 @@ public class Skeleton { let result = spine_skeleton_get_attachment_2(_ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self), slotIndex, attachmentName) guard let ptr = result else { return nil } let rtti = spine_attachment_get_rtti(ptr) - let className = String(cString: spine_rtti_get_class_name(rtti)!) - switch className { + let rttiClassName = String(cString: spine_rtti_get_class_name(rtti)!) + switch rttiClassName { case "spine_bounding_box_attachment": return BoundingBoxAttachment(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_bounding_box_attachment_wrapper.self)) case "spine_clipping_attachment": @@ -312,7 +315,7 @@ public class Skeleton { case "spine_region_attachment": return RegionAttachment(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_region_attachment_wrapper.self)) default: - fatalError("Unknown concrete type: \(className) for abstract class Attachment") + fatalError("Unknown concrete type: \(rttiClassName) for abstract class Attachment") } } diff --git a/spine-ios/Sources/SpineSwift/Generated/Skin.swift b/spine-ios/Sources/SpineSwift/Generated/Skin.swift index cc94345f2..6d8382fb8 100644 --- a/spine-ios/Sources/SpineSwift/Generated/Skin.swift +++ b/spine-ios/Sources/SpineSwift/Generated/Skin.swift @@ -33,11 +33,14 @@ import Foundation import SpineC /// Skin wrapper -public class Skin { +@objc(SpineSkin) +@objcMembers +public class Skin: NSObject { public let _ptr: UnsafeMutableRawPointer public init(fromPointer ptr: spine_skin) { self._ptr = UnsafeMutableRawPointer(ptr) + super.init() } public convenience init(_ name: String) { @@ -73,8 +76,8 @@ public class Skin { let result = spine_skin_get_attachment(_ptr.assumingMemoryBound(to: spine_skin_wrapper.self), slotIndex, name) guard let ptr = result else { return nil } let rtti = spine_attachment_get_rtti(ptr) - let className = String(cString: spine_rtti_get_class_name(rtti)!) - switch className { + let rttiClassName = String(cString: spine_rtti_get_class_name(rtti)!) + switch rttiClassName { case "spine_bounding_box_attachment": return BoundingBoxAttachment(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_bounding_box_attachment_wrapper.self)) case "spine_clipping_attachment": @@ -88,7 +91,7 @@ public class Skin { case "spine_region_attachment": return RegionAttachment(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_region_attachment_wrapper.self)) default: - fatalError("Unknown concrete type: \(className) for abstract class Attachment") + fatalError("Unknown concrete type: \(rttiClassName) for abstract class Attachment") } } diff --git a/spine-ios/Sources/SpineSwift/Generated/Slider.swift b/spine-ios/Sources/SpineSwift/Generated/Slider.swift index 3b22086e9..60b240a9d 100644 --- a/spine-ios/Sources/SpineSwift/Generated/Slider.swift +++ b/spine-ios/Sources/SpineSwift/Generated/Slider.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// Slider wrapper +@objc(SpineSlider) +@objcMembers public class Slider: PosedActive, Posed, Constraint { + @nonobjc public init(fromPointer ptr: spine_slider) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_posed_active_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/Slot.swift b/spine-ios/Sources/SpineSwift/Generated/Slot.swift index 2924a7265..7abb41495 100644 --- a/spine-ios/Sources/SpineSwift/Generated/Slot.swift +++ b/spine-ios/Sources/SpineSwift/Generated/Slot.swift @@ -33,11 +33,14 @@ import Foundation import SpineC /// Slot wrapper -public class Slot: Posed { +@objc(SpineSlot) +@objcMembers +public class Slot: NSObject, Posed { public let _ptr: UnsafeMutableRawPointer public init(fromPointer ptr: spine_slot) { self._ptr = UnsafeMutableRawPointer(ptr) + super.init() } public convenience init(_ data: SlotData, _ skeleton: Skeleton) { diff --git a/spine-ios/Sources/SpineSwift/Generated/Timeline.swift b/spine-ios/Sources/SpineSwift/Generated/Timeline.swift index bc0d4f109..8671126ea 100644 --- a/spine-ios/Sources/SpineSwift/Generated/Timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/Timeline.swift @@ -33,11 +33,14 @@ import Foundation import SpineC /// Timeline wrapper -open class Timeline { +@objc(SpineTimeline) +@objcMembers +open class Timeline: NSObject { public let _ptr: UnsafeMutableRawPointer public init(fromPointer ptr: spine_timeline) { self._ptr = UnsafeMutableRawPointer(ptr) + super.init() } public var rtti: Rtti { diff --git a/spine-ios/Sources/SpineSwift/Generated/alpha_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/alpha_timeline.swift index 99437a7b3..1376320e1 100644 --- a/spine-ios/Sources/SpineSwift/Generated/alpha_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/alpha_timeline.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// AlphaTimeline wrapper +@objc(SpineAlphaTimeline) +@objcMembers public class AlphaTimeline: CurveTimeline1, SlotTimeline { + @nonobjc public init(fromPointer ptr: spine_alpha_timeline) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_curve_timeline1_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/animation_state.swift b/spine-ios/Sources/SpineSwift/Generated/animation_state.swift index 1f9f357f1..bc9de2c8d 100644 --- a/spine-ios/Sources/SpineSwift/Generated/animation_state.swift +++ b/spine-ios/Sources/SpineSwift/Generated/animation_state.swift @@ -33,11 +33,14 @@ import Foundation import SpineC /// AnimationState wrapper -public class AnimationState { +@objc(SpineAnimationState) +@objcMembers +public class AnimationState: NSObject { public let _ptr: UnsafeMutableRawPointer public init(fromPointer ptr: spine_animation_state) { self._ptr = UnsafeMutableRawPointer(ptr) + super.init() } public convenience init(_ data: AnimationStateData) { diff --git a/spine-ios/Sources/SpineSwift/Generated/animation_state_data.swift b/spine-ios/Sources/SpineSwift/Generated/animation_state_data.swift index 0c0abd272..2d48a07a3 100644 --- a/spine-ios/Sources/SpineSwift/Generated/animation_state_data.swift +++ b/spine-ios/Sources/SpineSwift/Generated/animation_state_data.swift @@ -33,11 +33,14 @@ import Foundation import SpineC /// AnimationStateData wrapper -public class AnimationStateData { +@objc(SpineAnimationStateData) +@objcMembers +public class AnimationStateData: NSObject { public let _ptr: UnsafeMutableRawPointer public init(fromPointer ptr: spine_animation_state_data) { self._ptr = UnsafeMutableRawPointer(ptr) + super.init() } public convenience init(_ skeletonData: SkeletonData) { diff --git a/spine-ios/Sources/SpineSwift/Generated/atlas_attachment_loader.swift b/spine-ios/Sources/SpineSwift/Generated/atlas_attachment_loader.swift index 20f19f591..e2fdfdc9f 100644 --- a/spine-ios/Sources/SpineSwift/Generated/atlas_attachment_loader.swift +++ b/spine-ios/Sources/SpineSwift/Generated/atlas_attachment_loader.swift @@ -33,11 +33,14 @@ import Foundation import SpineC /// AtlasAttachmentLoader wrapper -public class AtlasAttachmentLoader: AttachmentLoader { +@objc(SpineAtlasAttachmentLoader) +@objcMembers +public class AtlasAttachmentLoader: NSObject, AttachmentLoader { public let _ptr: UnsafeMutableRawPointer public init(fromPointer ptr: spine_atlas_attachment_loader) { self._ptr = UnsafeMutableRawPointer(ptr) + super.init() } public convenience init(_ atlas: Atlas) { diff --git a/spine-ios/Sources/SpineSwift/Generated/atlas_page.swift b/spine-ios/Sources/SpineSwift/Generated/atlas_page.swift index b0a467056..13c08f974 100644 --- a/spine-ios/Sources/SpineSwift/Generated/atlas_page.swift +++ b/spine-ios/Sources/SpineSwift/Generated/atlas_page.swift @@ -33,11 +33,14 @@ import Foundation import SpineC /// AtlasPage wrapper -public class AtlasPage { +@objc(SpineAtlasPage) +@objcMembers +public class AtlasPage: NSObject { public let _ptr: UnsafeMutableRawPointer public init(fromPointer ptr: spine_atlas_page) { self._ptr = UnsafeMutableRawPointer(ptr) + super.init() } public convenience init(_ inName: String) { diff --git a/spine-ios/Sources/SpineSwift/Generated/atlas_region.swift b/spine-ios/Sources/SpineSwift/Generated/atlas_region.swift index 71d5fba15..863114753 100644 --- a/spine-ios/Sources/SpineSwift/Generated/atlas_region.swift +++ b/spine-ios/Sources/SpineSwift/Generated/atlas_region.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// AtlasRegion wrapper +@objc(SpineAtlasRegion) +@objcMembers public class AtlasRegion: TextureRegion { + @nonobjc public init(fromPointer ptr: spine_atlas_region) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_texture_region_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/attachment_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/attachment_timeline.swift index 289ff3595..8b739792b 100644 --- a/spine-ios/Sources/SpineSwift/Generated/attachment_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/attachment_timeline.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// AttachmentTimeline wrapper +@objc(SpineAttachmentTimeline) +@objcMembers public class AttachmentTimeline: Timeline, SlotTimeline { + @nonobjc public init(fromPointer ptr: spine_attachment_timeline) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_timeline_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/bone_data.swift b/spine-ios/Sources/SpineSwift/Generated/bone_data.swift index 7c52ece44..69b4f5574 100644 --- a/spine-ios/Sources/SpineSwift/Generated/bone_data.swift +++ b/spine-ios/Sources/SpineSwift/Generated/bone_data.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// BoneData wrapper +@objc(SpineBoneData) +@objcMembers public class BoneData: PosedData { + @nonobjc public init(fromPointer ptr: spine_bone_data) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_posed_data_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/bone_local.swift b/spine-ios/Sources/SpineSwift/Generated/bone_local.swift index 26527831f..c496b7ea3 100644 --- a/spine-ios/Sources/SpineSwift/Generated/bone_local.swift +++ b/spine-ios/Sources/SpineSwift/Generated/bone_local.swift @@ -33,14 +33,17 @@ import Foundation import SpineC /// BoneLocal wrapper -public class BoneLocal { +@objc(SpineBoneLocal) +@objcMembers +public class BoneLocal: NSObject { public let _ptr: UnsafeMutableRawPointer public init(fromPointer ptr: spine_bone_local) { self._ptr = UnsafeMutableRawPointer(ptr) + super.init() } - public convenience init() { + public override convenience init() { let ptr = spine_bone_local_create() self.init(fromPointer: ptr!) } diff --git a/spine-ios/Sources/SpineSwift/Generated/bone_pose.swift b/spine-ios/Sources/SpineSwift/Generated/bone_pose.swift index 2235bbda5..d8d1857f3 100644 --- a/spine-ios/Sources/SpineSwift/Generated/bone_pose.swift +++ b/spine-ios/Sources/SpineSwift/Generated/bone_pose.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// BonePose wrapper +@objc(SpineBonePose) +@objcMembers public class BonePose: BoneLocal, Update { + @nonobjc public init(fromPointer ptr: spine_bone_pose) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_bone_local_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/bone_timeline1.swift b/spine-ios/Sources/SpineSwift/Generated/bone_timeline1.swift index 52473f625..74a359e37 100644 --- a/spine-ios/Sources/SpineSwift/Generated/bone_timeline1.swift +++ b/spine-ios/Sources/SpineSwift/Generated/bone_timeline1.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// BoneTimeline1 wrapper +@objc(SpineBoneTimeline1) +@objcMembers open class BoneTimeline1: CurveTimeline1, BoneTimeline { + @nonobjc public init(fromPointer ptr: spine_bone_timeline1) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_curve_timeline1_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/bone_timeline2.swift b/spine-ios/Sources/SpineSwift/Generated/bone_timeline2.swift index a21548eab..5fe705468 100644 --- a/spine-ios/Sources/SpineSwift/Generated/bone_timeline2.swift +++ b/spine-ios/Sources/SpineSwift/Generated/bone_timeline2.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// BoneTimeline2 wrapper +@objc(SpineBoneTimeline2) +@objcMembers open class BoneTimeline2: CurveTimeline, BoneTimeline { + @nonobjc public init(fromPointer ptr: spine_bone_timeline2) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_curve_timeline_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/bounding_box_attachment.swift b/spine-ios/Sources/SpineSwift/Generated/bounding_box_attachment.swift index 9078bc790..6e76b81cf 100644 --- a/spine-ios/Sources/SpineSwift/Generated/bounding_box_attachment.swift +++ b/spine-ios/Sources/SpineSwift/Generated/bounding_box_attachment.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// BoundingBoxAttachment wrapper +@objc(SpineBoundingBoxAttachment) +@objcMembers public class BoundingBoxAttachment: VertexAttachment { + @nonobjc public init(fromPointer ptr: spine_bounding_box_attachment) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_vertex_attachment_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/clipping_attachment.swift b/spine-ios/Sources/SpineSwift/Generated/clipping_attachment.swift index 196c6f3f8..cb06b0e70 100644 --- a/spine-ios/Sources/SpineSwift/Generated/clipping_attachment.swift +++ b/spine-ios/Sources/SpineSwift/Generated/clipping_attachment.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// ClippingAttachment wrapper +@objc(SpineClippingAttachment) +@objcMembers public class ClippingAttachment: VertexAttachment { + @nonobjc public init(fromPointer ptr: spine_clipping_attachment) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_vertex_attachment_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/constraint_timeline1.swift b/spine-ios/Sources/SpineSwift/Generated/constraint_timeline1.swift index 3e06eb3ad..1baecd96f 100644 --- a/spine-ios/Sources/SpineSwift/Generated/constraint_timeline1.swift +++ b/spine-ios/Sources/SpineSwift/Generated/constraint_timeline1.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// ConstraintTimeline1 wrapper +@objc(SpineConstraintTimeline1) +@objcMembers open class ConstraintTimeline1: CurveTimeline1, ConstraintTimeline { + @nonobjc public init(fromPointer ptr: spine_constraint_timeline1) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_curve_timeline1_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/curve_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/curve_timeline.swift index c7811fba2..f5a4b6b21 100644 --- a/spine-ios/Sources/SpineSwift/Generated/curve_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/curve_timeline.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// CurveTimeline wrapper +@objc(SpineCurveTimeline) +@objcMembers open class CurveTimeline: Timeline { + @nonobjc public init(fromPointer ptr: spine_curve_timeline) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_timeline_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/curve_timeline1.swift b/spine-ios/Sources/SpineSwift/Generated/curve_timeline1.swift index 695ae9a81..838b0fe42 100644 --- a/spine-ios/Sources/SpineSwift/Generated/curve_timeline1.swift +++ b/spine-ios/Sources/SpineSwift/Generated/curve_timeline1.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// CurveTimeline1 wrapper +@objc(SpineCurveTimeline1) +@objcMembers open class CurveTimeline1: CurveTimeline { + @nonobjc public init(fromPointer ptr: spine_curve_timeline1) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_curve_timeline_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/deform_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/deform_timeline.swift index 60ce60543..ada310d1c 100644 --- a/spine-ios/Sources/SpineSwift/Generated/deform_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/deform_timeline.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// DeformTimeline wrapper +@objc(SpineDeformTimeline) +@objcMembers public class DeformTimeline: SlotCurveTimeline { + @nonobjc public init(fromPointer ptr: spine_deform_timeline) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_slot_curve_timeline_wrapper.self)) } @@ -47,8 +50,8 @@ public class DeformTimeline: SlotCurveTimeline { get { let result = spine_deform_timeline_get_attachment(_ptr.assumingMemoryBound(to: spine_deform_timeline_wrapper.self)) let rtti = spine_vertex_attachment_get_rtti(result!) - let className = String(cString: spine_rtti_get_class_name(rtti)!) - switch className { + let rttiClassName = String(cString: spine_rtti_get_class_name(rtti)!) + switch rttiClassName { case "spine_bounding_box_attachment": return BoundingBoxAttachment(fromPointer: UnsafeMutableRawPointer(result!).assumingMemoryBound(to: spine_bounding_box_attachment_wrapper.self)) case "spine_clipping_attachment": @@ -58,7 +61,7 @@ public class DeformTimeline: SlotCurveTimeline { case "spine_path_attachment": return PathAttachment(fromPointer: UnsafeMutableRawPointer(result!).assumingMemoryBound(to: spine_path_attachment_wrapper.self)) default: - fatalError("Unknown concrete type: \(className) for abstract class VertexAttachment") + fatalError("Unknown concrete type: \(rttiClassName) for abstract class VertexAttachment") } } set { diff --git a/spine-ios/Sources/SpineSwift/Generated/draw_order_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/draw_order_timeline.swift index 767c44093..d67bc4f80 100644 --- a/spine-ios/Sources/SpineSwift/Generated/draw_order_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/draw_order_timeline.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// DrawOrderTimeline wrapper +@objc(SpineDrawOrderTimeline) +@objcMembers public class DrawOrderTimeline: Timeline { + @nonobjc public init(fromPointer ptr: spine_draw_order_timeline) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_timeline_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/event_data.swift b/spine-ios/Sources/SpineSwift/Generated/event_data.swift index 8ef5e0588..3789588c3 100644 --- a/spine-ios/Sources/SpineSwift/Generated/event_data.swift +++ b/spine-ios/Sources/SpineSwift/Generated/event_data.swift @@ -33,11 +33,14 @@ import Foundation import SpineC /// EventData wrapper -public class EventData { +@objc(SpineEventData) +@objcMembers +public class EventData: NSObject { public let _ptr: UnsafeMutableRawPointer public init(fromPointer ptr: spine_event_data) { self._ptr = UnsafeMutableRawPointer(ptr) + super.init() } public convenience init(_ name: String) { diff --git a/spine-ios/Sources/SpineSwift/Generated/event_queue_entry.swift b/spine-ios/Sources/SpineSwift/Generated/event_queue_entry.swift index b9b17231b..c046ed239 100644 --- a/spine-ios/Sources/SpineSwift/Generated/event_queue_entry.swift +++ b/spine-ios/Sources/SpineSwift/Generated/event_queue_entry.swift @@ -33,11 +33,14 @@ import Foundation import SpineC /// EventQueueEntry wrapper -public class EventQueueEntry { +@objc(SpineEventQueueEntry) +@objcMembers +public class EventQueueEntry: NSObject { public let _ptr: UnsafeMutableRawPointer public init(fromPointer ptr: spine_event_queue_entry) { self._ptr = UnsafeMutableRawPointer(ptr) + super.init() } public convenience init(_ eventType: EventType, _ trackEntry: TrackEntry?, _ event: Event?) { diff --git a/spine-ios/Sources/SpineSwift/Generated/event_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/event_timeline.swift index bc420835b..30042b057 100644 --- a/spine-ios/Sources/SpineSwift/Generated/event_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/event_timeline.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// EventTimeline wrapper +@objc(SpineEventTimeline) +@objcMembers public class EventTimeline: Timeline { + @nonobjc public init(fromPointer ptr: spine_event_timeline) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_timeline_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/from_property.swift b/spine-ios/Sources/SpineSwift/Generated/from_property.swift index eda279ea4..f322efea6 100644 --- a/spine-ios/Sources/SpineSwift/Generated/from_property.swift +++ b/spine-ios/Sources/SpineSwift/Generated/from_property.swift @@ -33,11 +33,14 @@ import Foundation import SpineC /// FromProperty wrapper -open class FromProperty { +@objc(SpineFromProperty) +@objcMembers +open class FromProperty: NSObject { public let _ptr: UnsafeMutableRawPointer public init(fromPointer ptr: spine_from_property) { self._ptr = UnsafeMutableRawPointer(ptr) + super.init() } public var rtti: Rtti { diff --git a/spine-ios/Sources/SpineSwift/Generated/from_rotate.swift b/spine-ios/Sources/SpineSwift/Generated/from_rotate.swift index 278094682..8fe1a2033 100644 --- a/spine-ios/Sources/SpineSwift/Generated/from_rotate.swift +++ b/spine-ios/Sources/SpineSwift/Generated/from_rotate.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// FromRotate wrapper +@objc(SpineFromRotate) +@objcMembers public class FromRotate: FromProperty { + @nonobjc public init(fromPointer ptr: spine_from_rotate) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_from_property_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/from_scale_x.swift b/spine-ios/Sources/SpineSwift/Generated/from_scale_x.swift index 7bec69cb5..00e5a035f 100644 --- a/spine-ios/Sources/SpineSwift/Generated/from_scale_x.swift +++ b/spine-ios/Sources/SpineSwift/Generated/from_scale_x.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// FromScaleX wrapper +@objc(SpineFromScaleX) +@objcMembers public class FromScaleX: FromProperty { + @nonobjc public init(fromPointer ptr: spine_from_scale_x) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_from_property_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/from_scale_y.swift b/spine-ios/Sources/SpineSwift/Generated/from_scale_y.swift index aefb15542..888354601 100644 --- a/spine-ios/Sources/SpineSwift/Generated/from_scale_y.swift +++ b/spine-ios/Sources/SpineSwift/Generated/from_scale_y.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// FromScaleY wrapper +@objc(SpineFromScaleY) +@objcMembers public class FromScaleY: FromProperty { + @nonobjc public init(fromPointer ptr: spine_from_scale_y) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_from_property_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/from_shear_y.swift b/spine-ios/Sources/SpineSwift/Generated/from_shear_y.swift index 7bbbb0ccb..cbab7d8c1 100644 --- a/spine-ios/Sources/SpineSwift/Generated/from_shear_y.swift +++ b/spine-ios/Sources/SpineSwift/Generated/from_shear_y.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// FromShearY wrapper +@objc(SpineFromShearY) +@objcMembers public class FromShearY: FromProperty { + @nonobjc public init(fromPointer ptr: spine_from_shear_y) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_from_property_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/from_x.swift b/spine-ios/Sources/SpineSwift/Generated/from_x.swift index 73e2972e5..c1025416b 100644 --- a/spine-ios/Sources/SpineSwift/Generated/from_x.swift +++ b/spine-ios/Sources/SpineSwift/Generated/from_x.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// FromX wrapper +@objc(SpineFromX) +@objcMembers public class FromX: FromProperty { + @nonobjc public init(fromPointer ptr: spine_from_x) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_from_property_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/from_y.swift b/spine-ios/Sources/SpineSwift/Generated/from_y.swift index 19dd27c9e..b4633ab39 100644 --- a/spine-ios/Sources/SpineSwift/Generated/from_y.swift +++ b/spine-ios/Sources/SpineSwift/Generated/from_y.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// FromY wrapper +@objc(SpineFromY) +@objcMembers public class FromY: FromProperty { + @nonobjc public init(fromPointer ptr: spine_from_y) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_from_property_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/ik_constraint.swift b/spine-ios/Sources/SpineSwift/Generated/ik_constraint.swift index 3dc656eaf..f1bf22825 100644 --- a/spine-ios/Sources/SpineSwift/Generated/ik_constraint.swift +++ b/spine-ios/Sources/SpineSwift/Generated/ik_constraint.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// IkConstraint wrapper +@objc(SpineIkConstraint) +@objcMembers public class IkConstraint: PosedActive, Posed, Constraint { + @nonobjc public init(fromPointer ptr: spine_ik_constraint) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_posed_active_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/ik_constraint_data.swift b/spine-ios/Sources/SpineSwift/Generated/ik_constraint_data.swift index 6745279a6..202422a08 100644 --- a/spine-ios/Sources/SpineSwift/Generated/ik_constraint_data.swift +++ b/spine-ios/Sources/SpineSwift/Generated/ik_constraint_data.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// IkConstraintData wrapper +@objc(SpineIkConstraintData) +@objcMembers public class IkConstraintData: PosedData, ConstraintData { + @nonobjc public init(fromPointer ptr: spine_ik_constraint_data) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_posed_data_wrapper.self)) } @@ -81,8 +84,8 @@ public class IkConstraintData: PosedData, ConstraintData { public func createMethod(_ skeleton: Skeleton) -> Constraint { let result = spine_ik_constraint_data_create_method(_ptr.assumingMemoryBound(to: spine_ik_constraint_data_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) let rtti = spine_constraint_get_rtti(result!) - let className = String(cString: spine_rtti_get_class_name(rtti)!) - switch className { + let rttiClassName = String(cString: spine_rtti_get_class_name(rtti)!) + switch rttiClassName { case "spine_ik_constraint": return IkConstraint(fromPointer: UnsafeMutableRawPointer(result!).assumingMemoryBound(to: spine_ik_constraint_wrapper.self)) case "spine_path_constraint": @@ -94,7 +97,7 @@ public class IkConstraintData: PosedData, ConstraintData { case "spine_transform_constraint": return TransformConstraint(fromPointer: UnsafeMutableRawPointer(result!).assumingMemoryBound(to: spine_transform_constraint_wrapper.self)) default: - fatalError("Unknown concrete type: \(className) for abstract class Constraint") + fatalError("Unknown concrete type: \(rttiClassName) for abstract class Constraint") } } diff --git a/spine-ios/Sources/SpineSwift/Generated/ik_constraint_pose.swift b/spine-ios/Sources/SpineSwift/Generated/ik_constraint_pose.swift index 6a99fd710..909bf6ab4 100644 --- a/spine-ios/Sources/SpineSwift/Generated/ik_constraint_pose.swift +++ b/spine-ios/Sources/SpineSwift/Generated/ik_constraint_pose.swift @@ -33,14 +33,17 @@ import Foundation import SpineC /// IkConstraintPose wrapper -public class IkConstraintPose { +@objc(SpineIkConstraintPose) +@objcMembers +public class IkConstraintPose: NSObject { public let _ptr: UnsafeMutableRawPointer public init(fromPointer ptr: spine_ik_constraint_pose) { self._ptr = UnsafeMutableRawPointer(ptr) + super.init() } - public convenience init() { + public override convenience init() { let ptr = spine_ik_constraint_pose_create() self.init(fromPointer: ptr!) } diff --git a/spine-ios/Sources/SpineSwift/Generated/ik_constraint_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/ik_constraint_timeline.swift index 1d5393a1a..09e2e8749 100644 --- a/spine-ios/Sources/SpineSwift/Generated/ik_constraint_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/ik_constraint_timeline.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// IkConstraintTimeline wrapper +@objc(SpineIkConstraintTimeline) +@objcMembers public class IkConstraintTimeline: CurveTimeline, ConstraintTimeline { + @nonobjc public init(fromPointer ptr: spine_ik_constraint_timeline) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_curve_timeline_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/inherit_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/inherit_timeline.swift index 3016e5b3f..241186d27 100644 --- a/spine-ios/Sources/SpineSwift/Generated/inherit_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/inherit_timeline.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// InheritTimeline wrapper +@objc(SpineInheritTimeline) +@objcMembers public class InheritTimeline: Timeline, BoneTimeline { + @nonobjc public init(fromPointer ptr: spine_inherit_timeline) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_timeline_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/mesh_attachment.swift b/spine-ios/Sources/SpineSwift/Generated/mesh_attachment.swift index 5bf84245a..86659b669 100644 --- a/spine-ios/Sources/SpineSwift/Generated/mesh_attachment.swift +++ b/spine-ios/Sources/SpineSwift/Generated/mesh_attachment.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// MeshAttachment wrapper +@objc(SpineMeshAttachment) +@objcMembers public class MeshAttachment: VertexAttachment { + @nonobjc public init(fromPointer ptr: spine_mesh_attachment) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_vertex_attachment_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/path_attachment.swift b/spine-ios/Sources/SpineSwift/Generated/path_attachment.swift index 12537159a..f6e9f36d5 100644 --- a/spine-ios/Sources/SpineSwift/Generated/path_attachment.swift +++ b/spine-ios/Sources/SpineSwift/Generated/path_attachment.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// PathAttachment wrapper +@objc(SpinePathAttachment) +@objcMembers public class PathAttachment: VertexAttachment { + @nonobjc public init(fromPointer ptr: spine_path_attachment) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_vertex_attachment_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/path_constraint.swift b/spine-ios/Sources/SpineSwift/Generated/path_constraint.swift index eebfd41c5..834ba5c09 100644 --- a/spine-ios/Sources/SpineSwift/Generated/path_constraint.swift +++ b/spine-ios/Sources/SpineSwift/Generated/path_constraint.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// PathConstraint wrapper +@objc(SpinePathConstraint) +@objcMembers public class PathConstraint: PosedActive, Posed, Constraint { + @nonobjc public init(fromPointer ptr: spine_path_constraint) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_posed_active_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/path_constraint_data.swift b/spine-ios/Sources/SpineSwift/Generated/path_constraint_data.swift index c31d453a4..722621632 100644 --- a/spine-ios/Sources/SpineSwift/Generated/path_constraint_data.swift +++ b/spine-ios/Sources/SpineSwift/Generated/path_constraint_data.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// PathConstraintData wrapper +@objc(SpinePathConstraintData) +@objcMembers public class PathConstraintData: PosedData, ConstraintData { + @nonobjc public init(fromPointer ptr: spine_path_constraint_data) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_posed_data_wrapper.self)) } @@ -111,8 +114,8 @@ public class PathConstraintData: PosedData, ConstraintData { public func createMethod(_ skeleton: Skeleton) -> Constraint { let result = spine_path_constraint_data_create_method(_ptr.assumingMemoryBound(to: spine_path_constraint_data_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) let rtti = spine_constraint_get_rtti(result!) - let className = String(cString: spine_rtti_get_class_name(rtti)!) - switch className { + let rttiClassName = String(cString: spine_rtti_get_class_name(rtti)!) + switch rttiClassName { case "spine_ik_constraint": return IkConstraint(fromPointer: UnsafeMutableRawPointer(result!).assumingMemoryBound(to: spine_ik_constraint_wrapper.self)) case "spine_path_constraint": @@ -124,7 +127,7 @@ public class PathConstraintData: PosedData, ConstraintData { case "spine_transform_constraint": return TransformConstraint(fromPointer: UnsafeMutableRawPointer(result!).assumingMemoryBound(to: spine_transform_constraint_wrapper.self)) default: - fatalError("Unknown concrete type: \(className) for abstract class Constraint") + fatalError("Unknown concrete type: \(rttiClassName) for abstract class Constraint") } } diff --git a/spine-ios/Sources/SpineSwift/Generated/path_constraint_mix_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/path_constraint_mix_timeline.swift index 8cd15320a..b6a7bed79 100644 --- a/spine-ios/Sources/SpineSwift/Generated/path_constraint_mix_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/path_constraint_mix_timeline.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// PathConstraintMixTimeline wrapper +@objc(SpinePathConstraintMixTimeline) +@objcMembers public class PathConstraintMixTimeline: CurveTimeline, ConstraintTimeline { + @nonobjc public init(fromPointer ptr: spine_path_constraint_mix_timeline) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_curve_timeline_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/path_constraint_pose.swift b/spine-ios/Sources/SpineSwift/Generated/path_constraint_pose.swift index f05219b90..c4e2cd117 100644 --- a/spine-ios/Sources/SpineSwift/Generated/path_constraint_pose.swift +++ b/spine-ios/Sources/SpineSwift/Generated/path_constraint_pose.swift @@ -33,14 +33,17 @@ import Foundation import SpineC /// PathConstraintPose wrapper -public class PathConstraintPose { +@objc(SpinePathConstraintPose) +@objcMembers +public class PathConstraintPose: NSObject { public let _ptr: UnsafeMutableRawPointer public init(fromPointer ptr: spine_path_constraint_pose) { self._ptr = UnsafeMutableRawPointer(ptr) + super.init() } - public convenience init() { + public override convenience init() { let ptr = spine_path_constraint_pose_create() self.init(fromPointer: ptr!) } diff --git a/spine-ios/Sources/SpineSwift/Generated/path_constraint_position_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/path_constraint_position_timeline.swift index afc4a9800..e73ce7e5b 100644 --- a/spine-ios/Sources/SpineSwift/Generated/path_constraint_position_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/path_constraint_position_timeline.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// PathConstraintPositionTimeline wrapper +@objc(SpinePathConstraintPositionTimeline) +@objcMembers public class PathConstraintPositionTimeline: ConstraintTimeline1 { + @nonobjc public init(fromPointer ptr: spine_path_constraint_position_timeline) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_constraint_timeline1_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/path_constraint_spacing_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/path_constraint_spacing_timeline.swift index deb583779..d09f0b3fc 100644 --- a/spine-ios/Sources/SpineSwift/Generated/path_constraint_spacing_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/path_constraint_spacing_timeline.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// PathConstraintSpacingTimeline wrapper +@objc(SpinePathConstraintSpacingTimeline) +@objcMembers public class PathConstraintSpacingTimeline: ConstraintTimeline1 { + @nonobjc public init(fromPointer ptr: spine_path_constraint_spacing_timeline) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_constraint_timeline1_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/physics_constraint.swift b/spine-ios/Sources/SpineSwift/Generated/physics_constraint.swift index e5491eed3..f956d19c8 100644 --- a/spine-ios/Sources/SpineSwift/Generated/physics_constraint.swift +++ b/spine-ios/Sources/SpineSwift/Generated/physics_constraint.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// PhysicsConstraint wrapper +@objc(SpinePhysicsConstraint) +@objcMembers public class PhysicsConstraint: PosedActive, Posed, Constraint { + @nonobjc public init(fromPointer ptr: spine_physics_constraint) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_posed_active_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/physics_constraint_damping_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/physics_constraint_damping_timeline.swift index 2c65cdd02..644b6d962 100644 --- a/spine-ios/Sources/SpineSwift/Generated/physics_constraint_damping_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/physics_constraint_damping_timeline.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// PhysicsConstraintDampingTimeline wrapper +@objc(SpinePhysicsConstraintDampingTimeline) +@objcMembers public class PhysicsConstraintDampingTimeline: PhysicsConstraintTimeline { + @nonobjc public init(fromPointer ptr: spine_physics_constraint_damping_timeline) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_physics_constraint_timeline_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/physics_constraint_data.swift b/spine-ios/Sources/SpineSwift/Generated/physics_constraint_data.swift index a25dc1259..aca3aa3f8 100644 --- a/spine-ios/Sources/SpineSwift/Generated/physics_constraint_data.swift +++ b/spine-ios/Sources/SpineSwift/Generated/physics_constraint_data.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// PhysicsConstraintData wrapper +@objc(SpinePhysicsConstraintData) +@objcMembers public class PhysicsConstraintData: PosedData, ConstraintData { + @nonobjc public init(fromPointer ptr: spine_physics_constraint_data) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_posed_data_wrapper.self)) } @@ -206,8 +209,8 @@ public class PhysicsConstraintData: PosedData, ConstraintData { public func createMethod(_ skeleton: Skeleton) -> Constraint { let result = spine_physics_constraint_data_create_method(_ptr.assumingMemoryBound(to: spine_physics_constraint_data_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) let rtti = spine_constraint_get_rtti(result!) - let className = String(cString: spine_rtti_get_class_name(rtti)!) - switch className { + let rttiClassName = String(cString: spine_rtti_get_class_name(rtti)!) + switch rttiClassName { case "spine_ik_constraint": return IkConstraint(fromPointer: UnsafeMutableRawPointer(result!).assumingMemoryBound(to: spine_ik_constraint_wrapper.self)) case "spine_path_constraint": @@ -219,7 +222,7 @@ public class PhysicsConstraintData: PosedData, ConstraintData { case "spine_transform_constraint": return TransformConstraint(fromPointer: UnsafeMutableRawPointer(result!).assumingMemoryBound(to: spine_transform_constraint_wrapper.self)) default: - fatalError("Unknown concrete type: \(className) for abstract class Constraint") + fatalError("Unknown concrete type: \(rttiClassName) for abstract class Constraint") } } diff --git a/spine-ios/Sources/SpineSwift/Generated/physics_constraint_gravity_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/physics_constraint_gravity_timeline.swift index 02dfd1571..4f85a8cb1 100644 --- a/spine-ios/Sources/SpineSwift/Generated/physics_constraint_gravity_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/physics_constraint_gravity_timeline.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// PhysicsConstraintGravityTimeline wrapper +@objc(SpinePhysicsConstraintGravityTimeline) +@objcMembers public class PhysicsConstraintGravityTimeline: PhysicsConstraintTimeline { + @nonobjc public init(fromPointer ptr: spine_physics_constraint_gravity_timeline) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_physics_constraint_timeline_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/physics_constraint_inertia_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/physics_constraint_inertia_timeline.swift index 7dfdb4eec..a8a8706e1 100644 --- a/spine-ios/Sources/SpineSwift/Generated/physics_constraint_inertia_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/physics_constraint_inertia_timeline.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// PhysicsConstraintInertiaTimeline wrapper +@objc(SpinePhysicsConstraintInertiaTimeline) +@objcMembers public class PhysicsConstraintInertiaTimeline: PhysicsConstraintTimeline { + @nonobjc public init(fromPointer ptr: spine_physics_constraint_inertia_timeline) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_physics_constraint_timeline_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/physics_constraint_mass_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/physics_constraint_mass_timeline.swift index 4d62c89bb..11d752aa3 100644 --- a/spine-ios/Sources/SpineSwift/Generated/physics_constraint_mass_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/physics_constraint_mass_timeline.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// PhysicsConstraintMassTimeline wrapper +@objc(SpinePhysicsConstraintMassTimeline) +@objcMembers public class PhysicsConstraintMassTimeline: PhysicsConstraintTimeline { + @nonobjc public init(fromPointer ptr: spine_physics_constraint_mass_timeline) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_physics_constraint_timeline_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/physics_constraint_mix_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/physics_constraint_mix_timeline.swift index 3935c602b..ba46846a6 100644 --- a/spine-ios/Sources/SpineSwift/Generated/physics_constraint_mix_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/physics_constraint_mix_timeline.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// PhysicsConstraintMixTimeline wrapper +@objc(SpinePhysicsConstraintMixTimeline) +@objcMembers public class PhysicsConstraintMixTimeline: PhysicsConstraintTimeline { + @nonobjc public init(fromPointer ptr: spine_physics_constraint_mix_timeline) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_physics_constraint_timeline_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/physics_constraint_pose.swift b/spine-ios/Sources/SpineSwift/Generated/physics_constraint_pose.swift index 64169ffcc..5328abec5 100644 --- a/spine-ios/Sources/SpineSwift/Generated/physics_constraint_pose.swift +++ b/spine-ios/Sources/SpineSwift/Generated/physics_constraint_pose.swift @@ -33,14 +33,17 @@ import Foundation import SpineC /// PhysicsConstraintPose wrapper -public class PhysicsConstraintPose { +@objc(SpinePhysicsConstraintPose) +@objcMembers +public class PhysicsConstraintPose: NSObject { public let _ptr: UnsafeMutableRawPointer public init(fromPointer ptr: spine_physics_constraint_pose) { self._ptr = UnsafeMutableRawPointer(ptr) + super.init() } - public convenience init() { + public override convenience init() { let ptr = spine_physics_constraint_pose_create() self.init(fromPointer: ptr!) } diff --git a/spine-ios/Sources/SpineSwift/Generated/physics_constraint_reset_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/physics_constraint_reset_timeline.swift index 9fa3cfade..48f38a095 100644 --- a/spine-ios/Sources/SpineSwift/Generated/physics_constraint_reset_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/physics_constraint_reset_timeline.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// PhysicsConstraintResetTimeline wrapper +@objc(SpinePhysicsConstraintResetTimeline) +@objcMembers public class PhysicsConstraintResetTimeline: Timeline, ConstraintTimeline { + @nonobjc public init(fromPointer ptr: spine_physics_constraint_reset_timeline) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_timeline_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/physics_constraint_strength_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/physics_constraint_strength_timeline.swift index 85133c746..e02c176d6 100644 --- a/spine-ios/Sources/SpineSwift/Generated/physics_constraint_strength_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/physics_constraint_strength_timeline.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// PhysicsConstraintStrengthTimeline wrapper +@objc(SpinePhysicsConstraintStrengthTimeline) +@objcMembers public class PhysicsConstraintStrengthTimeline: PhysicsConstraintTimeline { + @nonobjc public init(fromPointer ptr: spine_physics_constraint_strength_timeline) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_physics_constraint_timeline_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/physics_constraint_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/physics_constraint_timeline.swift index b7784cdd4..01e15d40c 100644 --- a/spine-ios/Sources/SpineSwift/Generated/physics_constraint_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/physics_constraint_timeline.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// PhysicsConstraintTimeline wrapper +@objc(SpinePhysicsConstraintTimeline) +@objcMembers open class PhysicsConstraintTimeline: CurveTimeline1, ConstraintTimeline { + @nonobjc public init(fromPointer ptr: spine_physics_constraint_timeline) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_curve_timeline1_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/physics_constraint_wind_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/physics_constraint_wind_timeline.swift index 6c808299f..b32d55b8f 100644 --- a/spine-ios/Sources/SpineSwift/Generated/physics_constraint_wind_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/physics_constraint_wind_timeline.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// PhysicsConstraintWindTimeline wrapper +@objc(SpinePhysicsConstraintWindTimeline) +@objcMembers public class PhysicsConstraintWindTimeline: PhysicsConstraintTimeline { + @nonobjc public init(fromPointer ptr: spine_physics_constraint_wind_timeline) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_physics_constraint_timeline_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/point_attachment.swift b/spine-ios/Sources/SpineSwift/Generated/point_attachment.swift index 135a44db7..b6efaa9b1 100644 --- a/spine-ios/Sources/SpineSwift/Generated/point_attachment.swift +++ b/spine-ios/Sources/SpineSwift/Generated/point_attachment.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// PointAttachment wrapper +@objc(SpinePointAttachment) +@objcMembers public class PointAttachment: Attachment { + @nonobjc public init(fromPointer ptr: spine_point_attachment) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_attachment_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/posed_active.swift b/spine-ios/Sources/SpineSwift/Generated/posed_active.swift index 69b30ec42..c6a44b8bc 100644 --- a/spine-ios/Sources/SpineSwift/Generated/posed_active.swift +++ b/spine-ios/Sources/SpineSwift/Generated/posed_active.swift @@ -33,11 +33,14 @@ import Foundation import SpineC /// PosedActive wrapper -public class PosedActive { +@objc(SpinePosedActive) +@objcMembers +public class PosedActive: NSObject { public let _ptr: UnsafeMutableRawPointer public init(fromPointer ptr: spine_posed_active) { self._ptr = UnsafeMutableRawPointer(ptr) + super.init() } public var isActive: Bool { diff --git a/spine-ios/Sources/SpineSwift/Generated/posed_data.swift b/spine-ios/Sources/SpineSwift/Generated/posed_data.swift index 8bd9224f5..525148c5e 100644 --- a/spine-ios/Sources/SpineSwift/Generated/posed_data.swift +++ b/spine-ios/Sources/SpineSwift/Generated/posed_data.swift @@ -33,11 +33,14 @@ import Foundation import SpineC /// PosedData wrapper -public class PosedData { +@objc(SpinePosedData) +@objcMembers +public class PosedData: NSObject { public let _ptr: UnsafeMutableRawPointer public init(fromPointer ptr: spine_posed_data) { self._ptr = UnsafeMutableRawPointer(ptr) + super.init() } public convenience init(_ name: String) { diff --git a/spine-ios/Sources/SpineSwift/Generated/region_attachment.swift b/spine-ios/Sources/SpineSwift/Generated/region_attachment.swift index 10044dd73..71f7444e1 100644 --- a/spine-ios/Sources/SpineSwift/Generated/region_attachment.swift +++ b/spine-ios/Sources/SpineSwift/Generated/region_attachment.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// RegionAttachment wrapper +@objc(SpineRegionAttachment) +@objcMembers public class RegionAttachment: Attachment { + @nonobjc public init(fromPointer ptr: spine_region_attachment) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_attachment_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/render_command.swift b/spine-ios/Sources/SpineSwift/Generated/render_command.swift index 84e01caa5..cd76d6ccd 100644 --- a/spine-ios/Sources/SpineSwift/Generated/render_command.swift +++ b/spine-ios/Sources/SpineSwift/Generated/render_command.swift @@ -33,11 +33,14 @@ import Foundation import SpineC /// RenderCommand wrapper -public class RenderCommand { +@objc(SpineRenderCommand) +@objcMembers +public class RenderCommand: NSObject { public let _ptr: UnsafeMutableRawPointer public init(fromPointer ptr: spine_render_command) { self._ptr = UnsafeMutableRawPointer(ptr) + super.init() } public var positions: UnsafeMutablePointer? { diff --git a/spine-ios/Sources/SpineSwift/Generated/rgb2_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/rgb2_timeline.swift index 4c096552e..b588b1bfc 100644 --- a/spine-ios/Sources/SpineSwift/Generated/rgb2_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/rgb2_timeline.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// Rgb2Timeline wrapper +@objc(SpineRgb2Timeline) +@objcMembers public class Rgb2Timeline: SlotCurveTimeline { + @nonobjc public init(fromPointer ptr: spine_rgb2_timeline) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_slot_curve_timeline_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/rgb_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/rgb_timeline.swift index 350780880..36dce83db 100644 --- a/spine-ios/Sources/SpineSwift/Generated/rgb_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/rgb_timeline.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// RgbTimeline wrapper +@objc(SpineRgbTimeline) +@objcMembers public class RgbTimeline: SlotCurveTimeline { + @nonobjc public init(fromPointer ptr: spine_rgb_timeline) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_slot_curve_timeline_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/rgba2_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/rgba2_timeline.swift index 544ce2835..b0dd4f883 100644 --- a/spine-ios/Sources/SpineSwift/Generated/rgba2_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/rgba2_timeline.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// Rgba2Timeline wrapper +@objc(SpineRgba2Timeline) +@objcMembers public class Rgba2Timeline: SlotCurveTimeline { + @nonobjc public init(fromPointer ptr: spine_rgba2_timeline) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_slot_curve_timeline_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/rgba_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/rgba_timeline.swift index 6432335ad..b2bc3ef95 100644 --- a/spine-ios/Sources/SpineSwift/Generated/rgba_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/rgba_timeline.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// RgbaTimeline wrapper +@objc(SpineRgbaTimeline) +@objcMembers public class RgbaTimeline: SlotCurveTimeline { + @nonobjc public init(fromPointer ptr: spine_rgba_timeline) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_slot_curve_timeline_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/rotate_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/rotate_timeline.swift index fad4c1808..660e9cff2 100644 --- a/spine-ios/Sources/SpineSwift/Generated/rotate_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/rotate_timeline.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// RotateTimeline wrapper +@objc(SpineRotateTimeline) +@objcMembers public class RotateTimeline: BoneTimeline1 { + @nonobjc public init(fromPointer ptr: spine_rotate_timeline) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_bone_timeline1_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/scale_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/scale_timeline.swift index 802b157a2..5de42fb4c 100644 --- a/spine-ios/Sources/SpineSwift/Generated/scale_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/scale_timeline.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// ScaleTimeline wrapper +@objc(SpineScaleTimeline) +@objcMembers public class ScaleTimeline: BoneTimeline2 { + @nonobjc public init(fromPointer ptr: spine_scale_timeline) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_bone_timeline2_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/scale_x_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/scale_x_timeline.swift index ebcb69dd0..f823e809a 100644 --- a/spine-ios/Sources/SpineSwift/Generated/scale_x_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/scale_x_timeline.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// ScaleXTimeline wrapper +@objc(SpineScaleXTimeline) +@objcMembers public class ScaleXTimeline: BoneTimeline1 { + @nonobjc public init(fromPointer ptr: spine_scale_x_timeline) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_bone_timeline1_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/scale_y_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/scale_y_timeline.swift index 26b1916c3..f3ea817cc 100644 --- a/spine-ios/Sources/SpineSwift/Generated/scale_y_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/scale_y_timeline.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// ScaleYTimeline wrapper +@objc(SpineScaleYTimeline) +@objcMembers public class ScaleYTimeline: BoneTimeline1 { + @nonobjc public init(fromPointer ptr: spine_scale_y_timeline) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_bone_timeline1_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/sequence_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/sequence_timeline.swift index f7ba83e78..243a03cd9 100644 --- a/spine-ios/Sources/SpineSwift/Generated/sequence_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/sequence_timeline.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// SequenceTimeline wrapper +@objc(SpineSequenceTimeline) +@objcMembers public class SequenceTimeline: Timeline, SlotTimeline { + @nonobjc public init(fromPointer ptr: spine_sequence_timeline) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_timeline_wrapper.self)) } @@ -46,8 +49,8 @@ public class SequenceTimeline: Timeline, SlotTimeline { public var attachment: Attachment { let result = spine_sequence_timeline_get_attachment(_ptr.assumingMemoryBound(to: spine_sequence_timeline_wrapper.self)) let rtti = spine_attachment_get_rtti(result!) - let className = String(cString: spine_rtti_get_class_name(rtti)!) - switch className { + let rttiClassName = String(cString: spine_rtti_get_class_name(rtti)!) + switch rttiClassName { case "spine_bounding_box_attachment": return BoundingBoxAttachment(fromPointer: UnsafeMutableRawPointer(result!).assumingMemoryBound(to: spine_bounding_box_attachment_wrapper.self)) case "spine_clipping_attachment": @@ -61,7 +64,7 @@ public class SequenceTimeline: Timeline, SlotTimeline { case "spine_region_attachment": return RegionAttachment(fromPointer: UnsafeMutableRawPointer(result!).assumingMemoryBound(to: spine_region_attachment_wrapper.self)) default: - fatalError("Unknown concrete type: \(className) for abstract class Attachment") + fatalError("Unknown concrete type: \(rttiClassName) for abstract class Attachment") } } diff --git a/spine-ios/Sources/SpineSwift/Generated/shear_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/shear_timeline.swift index 64265484c..aaa2e8620 100644 --- a/spine-ios/Sources/SpineSwift/Generated/shear_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/shear_timeline.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// ShearTimeline wrapper +@objc(SpineShearTimeline) +@objcMembers public class ShearTimeline: BoneTimeline2 { + @nonobjc public init(fromPointer ptr: spine_shear_timeline) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_bone_timeline2_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/shear_x_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/shear_x_timeline.swift index 720f07b00..a14435d68 100644 --- a/spine-ios/Sources/SpineSwift/Generated/shear_x_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/shear_x_timeline.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// ShearXTimeline wrapper +@objc(SpineShearXTimeline) +@objcMembers public class ShearXTimeline: BoneTimeline1 { + @nonobjc public init(fromPointer ptr: spine_shear_x_timeline) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_bone_timeline1_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/shear_y_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/shear_y_timeline.swift index 7278dc42d..2232c1dd6 100644 --- a/spine-ios/Sources/SpineSwift/Generated/shear_y_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/shear_y_timeline.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// ShearYTimeline wrapper +@objc(SpineShearYTimeline) +@objcMembers public class ShearYTimeline: BoneTimeline1 { + @nonobjc public init(fromPointer ptr: spine_shear_y_timeline) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_bone_timeline1_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/skeleton_binary.swift b/spine-ios/Sources/SpineSwift/Generated/skeleton_binary.swift index 99515ec48..d0e318989 100644 --- a/spine-ios/Sources/SpineSwift/Generated/skeleton_binary.swift +++ b/spine-ios/Sources/SpineSwift/Generated/skeleton_binary.swift @@ -33,11 +33,14 @@ import Foundation import SpineC /// SkeletonBinary wrapper -public class SkeletonBinary { +@objc(SpineSkeletonBinary) +@objcMembers +public class SkeletonBinary: NSObject { public let _ptr: UnsafeMutableRawPointer public init(fromPointer ptr: spine_skeleton_binary) { self._ptr = UnsafeMutableRawPointer(ptr) + super.init() } public convenience init(_ atlas: Atlas) { diff --git a/spine-ios/Sources/SpineSwift/Generated/skeleton_bounds.swift b/spine-ios/Sources/SpineSwift/Generated/skeleton_bounds.swift index ee66e67e4..0a7bead09 100644 --- a/spine-ios/Sources/SpineSwift/Generated/skeleton_bounds.swift +++ b/spine-ios/Sources/SpineSwift/Generated/skeleton_bounds.swift @@ -33,14 +33,17 @@ import Foundation import SpineC /// SkeletonBounds wrapper -public class SkeletonBounds { +@objc(SpineSkeletonBounds) +@objcMembers +public class SkeletonBounds: NSObject { public let _ptr: UnsafeMutableRawPointer public init(fromPointer ptr: spine_skeleton_bounds) { self._ptr = UnsafeMutableRawPointer(ptr) + super.init() } - public convenience init() { + public override convenience init() { let ptr = spine_skeleton_bounds_create() self.init(fromPointer: ptr!) } diff --git a/spine-ios/Sources/SpineSwift/Generated/skeleton_clipping.swift b/spine-ios/Sources/SpineSwift/Generated/skeleton_clipping.swift index 1ce825ab0..07cfd976c 100644 --- a/spine-ios/Sources/SpineSwift/Generated/skeleton_clipping.swift +++ b/spine-ios/Sources/SpineSwift/Generated/skeleton_clipping.swift @@ -33,14 +33,17 @@ import Foundation import SpineC /// SkeletonClipping wrapper -public class SkeletonClipping { +@objc(SpineSkeletonClipping) +@objcMembers +public class SkeletonClipping: NSObject { public let _ptr: UnsafeMutableRawPointer public init(fromPointer ptr: spine_skeleton_clipping) { self._ptr = UnsafeMutableRawPointer(ptr) + super.init() } - public convenience init() { + public override convenience init() { let ptr = spine_skeleton_clipping_create() self.init(fromPointer: ptr!) } diff --git a/spine-ios/Sources/SpineSwift/Generated/skeleton_data.swift b/spine-ios/Sources/SpineSwift/Generated/skeleton_data.swift index 01004f120..10a19dcaa 100644 --- a/spine-ios/Sources/SpineSwift/Generated/skeleton_data.swift +++ b/spine-ios/Sources/SpineSwift/Generated/skeleton_data.swift @@ -33,14 +33,17 @@ import Foundation import SpineC /// SkeletonData wrapper -public class SkeletonData { +@objc(SpineSkeletonData) +@objcMembers +public class SkeletonData: NSObject { public let _ptr: UnsafeMutableRawPointer public init(fromPointer ptr: spine_skeleton_data) { self._ptr = UnsafeMutableRawPointer(ptr) + super.init() } - public convenience init() { + public override convenience init() { let ptr = spine_skeleton_data_create() self.init(fromPointer: ptr!) } @@ -155,7 +158,7 @@ public class SkeletonData { } } - public var hash: String { + public var hashString: String { get { let result = spine_skeleton_data_get_hash(_ptr.assumingMemoryBound(to: spine_skeleton_data_wrapper.self)) return String(cString: result!) diff --git a/spine-ios/Sources/SpineSwift/Generated/skeleton_json.swift b/spine-ios/Sources/SpineSwift/Generated/skeleton_json.swift index b8515ca0c..e8e956f28 100644 --- a/spine-ios/Sources/SpineSwift/Generated/skeleton_json.swift +++ b/spine-ios/Sources/SpineSwift/Generated/skeleton_json.swift @@ -33,11 +33,14 @@ import Foundation import SpineC /// SkeletonJson wrapper -public class SkeletonJson { +@objc(SpineSkeletonJson) +@objcMembers +public class SkeletonJson: NSObject { public let _ptr: UnsafeMutableRawPointer public init(fromPointer ptr: spine_skeleton_json) { self._ptr = UnsafeMutableRawPointer(ptr) + super.init() } public convenience init(_ atlas: Atlas) { diff --git a/spine-ios/Sources/SpineSwift/Generated/skeleton_renderer.swift b/spine-ios/Sources/SpineSwift/Generated/skeleton_renderer.swift index 098b3253b..439f9690e 100644 --- a/spine-ios/Sources/SpineSwift/Generated/skeleton_renderer.swift +++ b/spine-ios/Sources/SpineSwift/Generated/skeleton_renderer.swift @@ -33,14 +33,17 @@ import Foundation import SpineC /// SkeletonRenderer wrapper -public class SkeletonRenderer { +@objc(SpineSkeletonRenderer) +@objcMembers +public class SkeletonRenderer: NSObject { public let _ptr: UnsafeMutableRawPointer public init(fromPointer ptr: spine_skeleton_renderer) { self._ptr = UnsafeMutableRawPointer(ptr) + super.init() } - public convenience init() { + public override convenience init() { let ptr = spine_skeleton_renderer_create() self.init(fromPointer: ptr!) } diff --git a/spine-ios/Sources/SpineSwift/Generated/slider_data.swift b/spine-ios/Sources/SpineSwift/Generated/slider_data.swift index e90ad3ffb..21bf6d1ef 100644 --- a/spine-ios/Sources/SpineSwift/Generated/slider_data.swift +++ b/spine-ios/Sources/SpineSwift/Generated/slider_data.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// SliderData wrapper +@objc(SpineSliderData) +@objcMembers public class SliderData: PosedData, ConstraintData { + @nonobjc public init(fromPointer ptr: spine_slider_data) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_posed_data_wrapper.self)) } @@ -93,8 +96,8 @@ public class SliderData: PosedData, ConstraintData { let result = spine_slider_data_get_property(_ptr.assumingMemoryBound(to: spine_slider_data_wrapper.self)) guard let ptr = result else { return nil } let rtti = spine_from_property_get_rtti(ptr) - let className = String(cString: spine_rtti_get_class_name(rtti)!) - switch className { + let rttiClassName = String(cString: spine_rtti_get_class_name(rtti)!) + switch rttiClassName { case "spine_from_rotate": return FromRotate(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_from_rotate_wrapper.self)) case "spine_from_scale_x": @@ -108,7 +111,7 @@ public class SliderData: PosedData, ConstraintData { case "spine_from_y": return FromY(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_from_y_wrapper.self)) default: - fatalError("Unknown concrete type: \(className) for abstract class FromProperty") + fatalError("Unknown concrete type: \(rttiClassName) for abstract class FromProperty") } } set { @@ -154,8 +157,8 @@ public class SliderData: PosedData, ConstraintData { public func createMethod(_ skeleton: Skeleton) -> Constraint { let result = spine_slider_data_create_method(_ptr.assumingMemoryBound(to: spine_slider_data_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) let rtti = spine_constraint_get_rtti(result!) - let className = String(cString: spine_rtti_get_class_name(rtti)!) - switch className { + let rttiClassName = String(cString: spine_rtti_get_class_name(rtti)!) + switch rttiClassName { case "spine_ik_constraint": return IkConstraint(fromPointer: UnsafeMutableRawPointer(result!).assumingMemoryBound(to: spine_ik_constraint_wrapper.self)) case "spine_path_constraint": @@ -167,7 +170,7 @@ public class SliderData: PosedData, ConstraintData { case "spine_transform_constraint": return TransformConstraint(fromPointer: UnsafeMutableRawPointer(result!).assumingMemoryBound(to: spine_transform_constraint_wrapper.self)) default: - fatalError("Unknown concrete type: \(className) for abstract class Constraint") + fatalError("Unknown concrete type: \(rttiClassName) for abstract class Constraint") } } diff --git a/spine-ios/Sources/SpineSwift/Generated/slider_mix_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/slider_mix_timeline.swift index 19eec2110..4df32749f 100644 --- a/spine-ios/Sources/SpineSwift/Generated/slider_mix_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/slider_mix_timeline.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// SliderMixTimeline wrapper +@objc(SpineSliderMixTimeline) +@objcMembers public class SliderMixTimeline: ConstraintTimeline1 { + @nonobjc public init(fromPointer ptr: spine_slider_mix_timeline) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_constraint_timeline1_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/slider_pose.swift b/spine-ios/Sources/SpineSwift/Generated/slider_pose.swift index b0c9dd898..63e117468 100644 --- a/spine-ios/Sources/SpineSwift/Generated/slider_pose.swift +++ b/spine-ios/Sources/SpineSwift/Generated/slider_pose.swift @@ -33,14 +33,17 @@ import Foundation import SpineC /// SliderPose wrapper -public class SliderPose { +@objc(SpineSliderPose) +@objcMembers +public class SliderPose: NSObject { public let _ptr: UnsafeMutableRawPointer public init(fromPointer ptr: spine_slider_pose) { self._ptr = UnsafeMutableRawPointer(ptr) + super.init() } - public convenience init() { + public override convenience init() { let ptr = spine_slider_pose_create() self.init(fromPointer: ptr!) } diff --git a/spine-ios/Sources/SpineSwift/Generated/slider_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/slider_timeline.swift index 291556826..614f77cf8 100644 --- a/spine-ios/Sources/SpineSwift/Generated/slider_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/slider_timeline.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// SliderTimeline wrapper +@objc(SpineSliderTimeline) +@objcMembers public class SliderTimeline: ConstraintTimeline1 { + @nonobjc public init(fromPointer ptr: spine_slider_timeline) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_constraint_timeline1_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/slot_curve_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/slot_curve_timeline.swift index 5256f2535..133c2d807 100644 --- a/spine-ios/Sources/SpineSwift/Generated/slot_curve_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/slot_curve_timeline.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// SlotCurveTimeline wrapper +@objc(SpineSlotCurveTimeline) +@objcMembers open class SlotCurveTimeline: CurveTimeline, SlotTimeline { + @nonobjc public init(fromPointer ptr: spine_slot_curve_timeline) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_curve_timeline_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/slot_data.swift b/spine-ios/Sources/SpineSwift/Generated/slot_data.swift index 7ce4e9990..55213ba7a 100644 --- a/spine-ios/Sources/SpineSwift/Generated/slot_data.swift +++ b/spine-ios/Sources/SpineSwift/Generated/slot_data.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// SlotData wrapper +@objc(SpineSlotData) +@objcMembers public class SlotData: PosedData { + @nonobjc public init(fromPointer ptr: spine_slot_data) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_posed_data_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/slot_pose.swift b/spine-ios/Sources/SpineSwift/Generated/slot_pose.swift index bde2dbaae..07ff4ab3f 100644 --- a/spine-ios/Sources/SpineSwift/Generated/slot_pose.swift +++ b/spine-ios/Sources/SpineSwift/Generated/slot_pose.swift @@ -33,14 +33,17 @@ import Foundation import SpineC /// SlotPose wrapper -public class SlotPose { +@objc(SpineSlotPose) +@objcMembers +public class SlotPose: NSObject { public let _ptr: UnsafeMutableRawPointer public init(fromPointer ptr: spine_slot_pose) { self._ptr = UnsafeMutableRawPointer(ptr) + super.init() } - public convenience init() { + public override convenience init() { let ptr = spine_slot_pose_create() self.init(fromPointer: ptr!) } @@ -70,8 +73,8 @@ public class SlotPose { let result = spine_slot_pose_get_attachment(_ptr.assumingMemoryBound(to: spine_slot_pose_wrapper.self)) guard let ptr = result else { return nil } let rtti = spine_attachment_get_rtti(ptr) - let className = String(cString: spine_rtti_get_class_name(rtti)!) - switch className { + let rttiClassName = String(cString: spine_rtti_get_class_name(rtti)!) + switch rttiClassName { case "spine_bounding_box_attachment": return BoundingBoxAttachment(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_bounding_box_attachment_wrapper.self)) case "spine_clipping_attachment": @@ -85,7 +88,7 @@ public class SlotPose { case "spine_region_attachment": return RegionAttachment(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_region_attachment_wrapper.self)) default: - fatalError("Unknown concrete type: \(className) for abstract class Attachment") + fatalError("Unknown concrete type: \(rttiClassName) for abstract class Attachment") } } set { diff --git a/spine-ios/Sources/SpineSwift/Generated/texture_region.swift b/spine-ios/Sources/SpineSwift/Generated/texture_region.swift index e1288313d..10817b16b 100644 --- a/spine-ios/Sources/SpineSwift/Generated/texture_region.swift +++ b/spine-ios/Sources/SpineSwift/Generated/texture_region.swift @@ -33,14 +33,17 @@ import Foundation import SpineC /// TextureRegion wrapper -public class TextureRegion { +@objc(SpineTextureRegion) +@objcMembers +public class TextureRegion: NSObject { public let _ptr: UnsafeMutableRawPointer public init(fromPointer ptr: spine_texture_region) { self._ptr = UnsafeMutableRawPointer(ptr) + super.init() } - public convenience init() { + public override convenience init() { let ptr = spine_texture_region_create() self.init(fromPointer: ptr!) } diff --git a/spine-ios/Sources/SpineSwift/Generated/to_property.swift b/spine-ios/Sources/SpineSwift/Generated/to_property.swift index c261c246e..fba7277b7 100644 --- a/spine-ios/Sources/SpineSwift/Generated/to_property.swift +++ b/spine-ios/Sources/SpineSwift/Generated/to_property.swift @@ -33,11 +33,14 @@ import Foundation import SpineC /// ToProperty wrapper -open class ToProperty { +@objc(SpineToProperty) +@objcMembers +open class ToProperty: NSObject { public let _ptr: UnsafeMutableRawPointer public init(fromPointer ptr: spine_to_property) { self._ptr = UnsafeMutableRawPointer(ptr) + super.init() } public var rtti: Rtti { diff --git a/spine-ios/Sources/SpineSwift/Generated/to_rotate.swift b/spine-ios/Sources/SpineSwift/Generated/to_rotate.swift index 098bd0826..c56b2e320 100644 --- a/spine-ios/Sources/SpineSwift/Generated/to_rotate.swift +++ b/spine-ios/Sources/SpineSwift/Generated/to_rotate.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// ToRotate wrapper +@objc(SpineToRotate) +@objcMembers public class ToRotate: ToProperty { + @nonobjc public init(fromPointer ptr: spine_to_rotate) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_to_property_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/to_scale_x.swift b/spine-ios/Sources/SpineSwift/Generated/to_scale_x.swift index a6d713dfe..91f295263 100644 --- a/spine-ios/Sources/SpineSwift/Generated/to_scale_x.swift +++ b/spine-ios/Sources/SpineSwift/Generated/to_scale_x.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// ToScaleX wrapper +@objc(SpineToScaleX) +@objcMembers public class ToScaleX: ToProperty { + @nonobjc public init(fromPointer ptr: spine_to_scale_x) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_to_property_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/to_scale_y.swift b/spine-ios/Sources/SpineSwift/Generated/to_scale_y.swift index beca70c14..6a5571fa2 100644 --- a/spine-ios/Sources/SpineSwift/Generated/to_scale_y.swift +++ b/spine-ios/Sources/SpineSwift/Generated/to_scale_y.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// ToScaleY wrapper +@objc(SpineToScaleY) +@objcMembers public class ToScaleY: ToProperty { + @nonobjc public init(fromPointer ptr: spine_to_scale_y) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_to_property_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/to_shear_y.swift b/spine-ios/Sources/SpineSwift/Generated/to_shear_y.swift index 5e1c799ee..320c3386d 100644 --- a/spine-ios/Sources/SpineSwift/Generated/to_shear_y.swift +++ b/spine-ios/Sources/SpineSwift/Generated/to_shear_y.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// ToShearY wrapper +@objc(SpineToShearY) +@objcMembers public class ToShearY: ToProperty { + @nonobjc public init(fromPointer ptr: spine_to_shear_y) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_to_property_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/to_x.swift b/spine-ios/Sources/SpineSwift/Generated/to_x.swift index 2375beccc..5fd6134e7 100644 --- a/spine-ios/Sources/SpineSwift/Generated/to_x.swift +++ b/spine-ios/Sources/SpineSwift/Generated/to_x.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// ToX wrapper +@objc(SpineToX) +@objcMembers public class ToX: ToProperty { + @nonobjc public init(fromPointer ptr: spine_to_x) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_to_property_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/to_y.swift b/spine-ios/Sources/SpineSwift/Generated/to_y.swift index d26063ad5..e0e7d05c7 100644 --- a/spine-ios/Sources/SpineSwift/Generated/to_y.swift +++ b/spine-ios/Sources/SpineSwift/Generated/to_y.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// ToY wrapper +@objc(SpineToY) +@objcMembers public class ToY: ToProperty { + @nonobjc public init(fromPointer ptr: spine_to_y) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_to_property_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/track_entry.swift b/spine-ios/Sources/SpineSwift/Generated/track_entry.swift index c3d465cc9..57705112c 100644 --- a/spine-ios/Sources/SpineSwift/Generated/track_entry.swift +++ b/spine-ios/Sources/SpineSwift/Generated/track_entry.swift @@ -33,14 +33,17 @@ import Foundation import SpineC /// TrackEntry wrapper -public class TrackEntry { +@objc(SpineTrackEntry) +@objcMembers +public class TrackEntry: NSObject { public let _ptr: UnsafeMutableRawPointer public init(fromPointer ptr: spine_track_entry) { self._ptr = UnsafeMutableRawPointer(ptr) + super.init() } - public convenience init() { + public override convenience init() { let ptr = spine_track_entry_create() self.init(fromPointer: ptr!) } diff --git a/spine-ios/Sources/SpineSwift/Generated/transform_constraint.swift b/spine-ios/Sources/SpineSwift/Generated/transform_constraint.swift index 5b13da95d..341cd4228 100644 --- a/spine-ios/Sources/SpineSwift/Generated/transform_constraint.swift +++ b/spine-ios/Sources/SpineSwift/Generated/transform_constraint.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// TransformConstraint wrapper +@objc(SpineTransformConstraint) +@objcMembers public class TransformConstraint: PosedActive, Posed, Constraint { + @nonobjc public init(fromPointer ptr: spine_transform_constraint) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_posed_active_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/transform_constraint_data.swift b/spine-ios/Sources/SpineSwift/Generated/transform_constraint_data.swift index 8d9d40bb6..aacda7b36 100644 --- a/spine-ios/Sources/SpineSwift/Generated/transform_constraint_data.swift +++ b/spine-ios/Sources/SpineSwift/Generated/transform_constraint_data.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// TransformConstraintData wrapper +@objc(SpineTransformConstraintData) +@objcMembers public class TransformConstraintData: PosedData, ConstraintData { + @nonobjc public init(fromPointer ptr: spine_transform_constraint_data) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_posed_data_wrapper.self)) } @@ -176,8 +179,8 @@ public class TransformConstraintData: PosedData, ConstraintData { public func createMethod(_ skeleton: Skeleton) -> Constraint { let result = spine_transform_constraint_data_create_method(_ptr.assumingMemoryBound(to: spine_transform_constraint_data_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) let rtti = spine_constraint_get_rtti(result!) - let className = String(cString: spine_rtti_get_class_name(rtti)!) - switch className { + let rttiClassName = String(cString: spine_rtti_get_class_name(rtti)!) + switch rttiClassName { case "spine_ik_constraint": return IkConstraint(fromPointer: UnsafeMutableRawPointer(result!).assumingMemoryBound(to: spine_ik_constraint_wrapper.self)) case "spine_path_constraint": @@ -189,7 +192,7 @@ public class TransformConstraintData: PosedData, ConstraintData { case "spine_transform_constraint": return TransformConstraint(fromPointer: UnsafeMutableRawPointer(result!).assumingMemoryBound(to: spine_transform_constraint_wrapper.self)) default: - fatalError("Unknown concrete type: \(className) for abstract class Constraint") + fatalError("Unknown concrete type: \(rttiClassName) for abstract class Constraint") } } diff --git a/spine-ios/Sources/SpineSwift/Generated/transform_constraint_pose.swift b/spine-ios/Sources/SpineSwift/Generated/transform_constraint_pose.swift index 141f1a3b8..9b0b8b9a2 100644 --- a/spine-ios/Sources/SpineSwift/Generated/transform_constraint_pose.swift +++ b/spine-ios/Sources/SpineSwift/Generated/transform_constraint_pose.swift @@ -33,14 +33,17 @@ import Foundation import SpineC /// TransformConstraintPose wrapper -public class TransformConstraintPose { +@objc(SpineTransformConstraintPose) +@objcMembers +public class TransformConstraintPose: NSObject { public let _ptr: UnsafeMutableRawPointer public init(fromPointer ptr: spine_transform_constraint_pose) { self._ptr = UnsafeMutableRawPointer(ptr) + super.init() } - public convenience init() { + public override convenience init() { let ptr = spine_transform_constraint_pose_create() self.init(fromPointer: ptr!) } diff --git a/spine-ios/Sources/SpineSwift/Generated/transform_constraint_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/transform_constraint_timeline.swift index d9b5c346b..0cf7048e1 100644 --- a/spine-ios/Sources/SpineSwift/Generated/transform_constraint_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/transform_constraint_timeline.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// TransformConstraintTimeline wrapper +@objc(SpineTransformConstraintTimeline) +@objcMembers public class TransformConstraintTimeline: CurveTimeline, ConstraintTimeline { + @nonobjc public init(fromPointer ptr: spine_transform_constraint_timeline) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_curve_timeline_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/translate_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/translate_timeline.swift index 4f38670b0..e773a5236 100644 --- a/spine-ios/Sources/SpineSwift/Generated/translate_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/translate_timeline.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// TranslateTimeline wrapper +@objc(SpineTranslateTimeline) +@objcMembers public class TranslateTimeline: BoneTimeline2 { + @nonobjc public init(fromPointer ptr: spine_translate_timeline) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_bone_timeline2_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/translate_x_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/translate_x_timeline.swift index 4775aa852..23945908d 100644 --- a/spine-ios/Sources/SpineSwift/Generated/translate_x_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/translate_x_timeline.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// TranslateXTimeline wrapper +@objc(SpineTranslateXTimeline) +@objcMembers public class TranslateXTimeline: BoneTimeline1 { + @nonobjc public init(fromPointer ptr: spine_translate_x_timeline) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_bone_timeline1_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/translate_y_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/translate_y_timeline.swift index 36a4bf986..4b4cc619b 100644 --- a/spine-ios/Sources/SpineSwift/Generated/translate_y_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/translate_y_timeline.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// TranslateYTimeline wrapper +@objc(SpineTranslateYTimeline) +@objcMembers public class TranslateYTimeline: BoneTimeline1 { + @nonobjc public init(fromPointer ptr: spine_translate_y_timeline) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_bone_timeline1_wrapper.self)) } diff --git a/spine-ios/Sources/SpineSwift/Generated/vertex_attachment.swift b/spine-ios/Sources/SpineSwift/Generated/vertex_attachment.swift index 49b6bacb5..e6904c64c 100644 --- a/spine-ios/Sources/SpineSwift/Generated/vertex_attachment.swift +++ b/spine-ios/Sources/SpineSwift/Generated/vertex_attachment.swift @@ -33,7 +33,10 @@ import Foundation import SpineC /// VertexAttachment wrapper +@objc(SpineVertexAttachment) +@objcMembers open class VertexAttachment: Attachment { + @nonobjc public init(fromPointer ptr: spine_vertex_attachment) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_attachment_wrapper.self)) } @@ -78,8 +81,8 @@ open class VertexAttachment: Attachment { let result = spine_vertex_attachment_get_timeline_attachment(_ptr.assumingMemoryBound(to: spine_vertex_attachment_wrapper.self)) guard let ptr = result else { return nil } let rtti = spine_attachment_get_rtti(ptr) - let className = String(cString: spine_rtti_get_class_name(rtti)!) - switch className { + let rttiClassName = String(cString: spine_rtti_get_class_name(rtti)!) + switch rttiClassName { case "spine_bounding_box_attachment": return BoundingBoxAttachment(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_bounding_box_attachment_wrapper.self)) case "spine_clipping_attachment": @@ -93,7 +96,7 @@ open class VertexAttachment: Attachment { case "spine_region_attachment": return RegionAttachment(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_region_attachment_wrapper.self)) default: - fatalError("Unknown concrete type: \(className) for abstract class Attachment") + fatalError("Unknown concrete type: \(rttiClassName) for abstract class Attachment") } } set { diff --git a/spine-ios/codegen/src/swift-writer.ts b/spine-ios/codegen/src/swift-writer.ts index 8628c8004..bc932ad27 100644 --- a/spine-ios/codegen/src/swift-writer.ts +++ b/spine-ios/codegen/src/swift-writer.ts @@ -635,11 +635,13 @@ export class SwiftWriter { if (swiftClass.type === 'protocol') { declaration = `public protocol ${swiftClass.name}`; } else { - // Remove @objc annotations to avoid conflicts + // Add @objc annotations for Objective-C compatibility + const objcAnnotations = `@objc(Spine${swiftClass.name})\n@objcMembers\n`; + if (swiftClass.type === 'abstract') { - declaration = `open class ${swiftClass.name}`; + declaration = `${objcAnnotations}open class ${swiftClass.name}`; } else { - declaration = `public class ${swiftClass.name}`; + declaration = `${objcAnnotations}public class ${swiftClass.name}`; } } @@ -648,6 +650,9 @@ export class SwiftWriter { if (swiftClass.inheritance.extends) { inheritanceParts.push(swiftClass.inheritance.extends); + } else if (swiftClass.type !== 'protocol') { + // Root classes inherit from NSObject for Objective-C compatibility + inheritanceParts.push('NSObject'); } // Add protocols @@ -746,13 +751,17 @@ ${declaration} {`; if (swiftClass.inheritance.extends) { const parentTypeName = this.toCTypeName(swiftClass.inheritance.extends); // Subclass - NO ptr field, pass typed pointer cast to parent type - return ` public init(fromPointer ptr: ${cTypeName}) { + // Use @nonobjc to prevent Objective-C selector conflicts + return ` @nonobjc + public init(fromPointer ptr: ${cTypeName}) { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: ${parentTypeName}_wrapper.self)) }`; } else { // Root class - HAS _ptr field, store as UnsafeMutableRawPointer + // Must call super.init() since we inherit from NSObject return ` public init(fromPointer ptr: ${cTypeName}) { self._ptr = UnsafeMutableRawPointer(ptr) + super.init() }`; } } @@ -840,7 +849,12 @@ ${declaration} {`; if (member.name === member.swiftReturnType) { // Convenience initializer - return ` public convenience init(${params}) { + // Only root classes (not subclasses) need override for no-arg init + // Check if this is a root class by looking at swiftClass + const swiftClass = this.classMap.get(this.fromSwiftTypeName(member.swiftReturnType)); + const isRootClass = swiftClass && !this.inheritance[swiftClass.name]?.extends; + const override = (params === '' && isRootClass) ? 'override ' : ''; + return ` public ${override}convenience init(${params}) { ${member.implementation.replace(`return ${member.swiftReturnType}(fromPointer: ptr!)`, 'self.init(fromPointer: ptr!)')} }`; } else { @@ -914,7 +928,9 @@ ${declaration} {`; const cTypeName = this.toCTypeName(swiftClassName); lines.push(`/// ${swiftClassName} wrapper`); - lines.push(`public class ${swiftClassName} {`); + lines.push(`@objc(Spine${swiftClassName})`); + lines.push(`@objcMembers`); + lines.push(`public class ${swiftClassName}: NSObject {`); lines.push(' public let _ptr: UnsafeMutableRawPointer'); lines.push(' private let _ownsMemory: Bool'); lines.push(''); @@ -923,6 +939,7 @@ ${declaration} {`; lines.push(` public init(fromPointer ptr: ${cTypeName}, ownsMemory: Bool = false) {`); lines.push(' self._ptr = UnsafeMutableRawPointer(ptr)'); lines.push(' self._ownsMemory = ownsMemory'); + lines.push(' super.init()'); lines.push(' }'); lines.push(''); @@ -936,7 +953,7 @@ ${declaration} {`; // Add default constructor if (createMethod) { lines.push(' /// Create a new empty array'); - lines.push(' public convenience init() {'); + lines.push(' public override convenience init() {'); lines.push(` let ptr = ${createMethod.name}()!`); lines.push(' self.init(fromPointer: ptr, ownsMemory: true)'); lines.push(' }'); @@ -1400,8 +1417,8 @@ ${declaration} {`; } lines.push(`let rtti = ${abstractClass.name}_get_rtti(${resultVar})`); - lines.push(`let className = String(cString: spine_rtti_get_class_name(rtti)!)`); - lines.push(`switch className {`); + lines.push(`let rttiClassName = String(cString: spine_rtti_get_class_name(rtti)!)`); + lines.push(`switch rttiClassName {`); for (const subclass of concreteSubclasses) { const swiftSubclass = this.toSwiftTypeName(subclass); @@ -1412,7 +1429,7 @@ ${declaration} {`; } lines.push(`default:`); - lines.push(` fatalError("Unknown concrete type: \\(className) for abstract class ${abstractType}")`); + lines.push(` fatalError("Unknown concrete type: \\(rttiClassName) for abstract class ${abstractType}")`); lines.push(`}`); return lines.join('\n '); @@ -1483,7 +1500,17 @@ ${declaration} {`; return `${this.toCamelCase(name)}Value`; } - return this.toCamelCase(name); + let propertyName = this.toCamelCase(name); + + // Rename properties that conflict with NSObject + if (propertyName === 'className') { + return 'rttiClassName'; + } + if (propertyName === 'hash') { + return 'hashString'; + } + + return propertyName; } private hasRawPointerParameters(method: CMethod): boolean { @@ -1605,6 +1632,11 @@ ${declaration} {`; return; } + private fromSwiftTypeName(swiftTypeName: string): string { + // Convert Swift class name back to C type name + return `spine_${toSnakeCase(swiftTypeName)}`; + } + private toPascalCase(str: string): string { return str.split('_') .map(word => word.charAt(0).toUpperCase() + word.slice(1)) diff --git a/spine-ios/test/src/skeleton_drawable_test_swift.swift b/spine-ios/test/src/skeleton_drawable_test_swift.swift index 9920f02c1..d05ff060a 100644 --- a/spine-ios/test/src/skeleton_drawable_test_swift.swift +++ b/spine-ios/test/src/skeleton_drawable_test_swift.swift @@ -165,7 +165,7 @@ func runSkeletonDrawableTestSwift() { for i in 0..