diff --git a/spine-ios/Example/Spine iOS Example/AnimationStateEvents.swift b/spine-ios/Example/Spine iOS Example/AnimationStateEvents.swift index 6fabcf5d8..c9c6e64ce 100644 --- a/spine-ios/Example/Spine iOS Example/AnimationStateEvents.swift +++ b/spine-ios/Example/Spine iOS Example/AnimationStateEvents.swift @@ -69,6 +69,11 @@ struct AnimationStateEvents: View { controller: controller ) } + .onDisappear { + // SwiftUI may retain the @StateObject controller after the view disappears. + // Explicit disposal is only needed here so leak reporting runs after native teardown. + controller.dispose() + } .navigationTitle("Animation State Listener") .navigationBarTitleDisplayMode(.inline) } diff --git a/spine-ios/Example/Spine iOS Example/DebugRendering.swift b/spine-ios/Example/Spine iOS Example/DebugRendering.swift index b3262099f..4fae8feed 100644 --- a/spine-ios/Example/Spine iOS Example/DebugRendering.swift +++ b/spine-ios/Example/Spine iOS Example/DebugRendering.swift @@ -51,6 +51,11 @@ struct DebugRendering: View { .frame(width: boneLocation.width, height: boneLocation.height) } } + .onDisappear { + // SwiftUI may retain the @StateObject model after the view disappears. + // Explicit disposal is only needed here so leak reporting runs after native teardown. + model.dispose() + } .navigationTitle("Debug Rendering") .navigationBarTitleDisplayMode(.inline) } @@ -62,6 +67,14 @@ struct DebugRendering: View { final class DebugRenderingModel: ObservableObject { + // Not strictly necessary for normal usage. SwiftUI will eventually release the + // model and controller. We dispose explicitly here so leak reporting runs after + // native teardown when navigating back from the example. + func dispose() { + controller.dispose() + } + + @Published var controller: SpineController! diff --git a/spine-ios/Example/Spine iOS Example/DisableRendering.swift b/spine-ios/Example/Spine iOS Example/DisableRendering.swift index 01065261e..92cd268bf 100644 --- a/spine-ios/Example/Spine iOS Example/DisableRendering.swift +++ b/spine-ios/Example/Spine iOS Example/DisableRendering.swift @@ -76,6 +76,11 @@ struct DisableRendering: View { .frame(minHeight: 400) } } + .onDisappear { + // SwiftUI may retain the @StateObject controller after the view disappears. + // Explicit disposal is only needed here so leak reporting runs after native teardown. + controller.dispose() + } .navigationTitle("Disable Rendering") .navigationBarTitleDisplayMode(.inline) } diff --git a/spine-ios/Example/Spine iOS Example/DressUp.swift b/spine-ios/Example/Spine iOS Example/DressUp.swift index 32e5c81f9..f971d9761 100644 --- a/spine-ios/Example/Spine iOS Example/DressUp.swift +++ b/spine-ios/Example/Spine iOS Example/DressUp.swift @@ -64,6 +64,20 @@ struct DressUp: View { Spacer() } } + .onDisappear { + // SwiftUI may retain the @StateObject model after the view disappears. + // Explicit disposal is only needed here so leak reporting runs after native teardown. + model.dispose() + + // This example also passes the drawable directly to SpineView via .drawable(...). + // SwiftUI can keep the disappearing view alive for a bit longer, so delay leak + // reporting until that view and its source have been released. + DispatchQueue.main.async { + DispatchQueue.main.async { + reportLeaks() + } + } + } .navigationTitle("Dress Up") .navigationBarTitleDisplayMode(.inline) } @@ -75,6 +89,21 @@ struct DressUp: View { final class DressUpModel: ObservableObject { + // Not strictly necessary for normal usage. SwiftUI will eventually release the + // model and controller. We dispose explicitly here so leak reporting runs after + // native teardown when navigating back from the example. + func dispose() { + disposed = true + loadTask?.cancel() + loadTask = nil + controller.dispose() + drawable?.dispose() + drawable = nil + customSkin?.dispose() + customSkin = nil + } + + let thumbnailSize = CGSize(width: 200, height: 200) let boundsProvider: BoundsProvider = SkinAndAnimationBounds(skins: ["full-skins/girl"]) @@ -91,6 +120,8 @@ final class DressUpModel: ObservableObject { var selectedSkins = [String: Bool]() private var customSkin: Skin? + private var loadTask: Task? + private var disposed = false init() { controller = SpineController( @@ -99,37 +130,56 @@ final class DressUpModel: ObservableObject { }, disposeDrawableOnDeInit: false ) - Task.detached(priority: .high) { - let drawable = try await SkeletonDrawableWrapper.fromBundle( - atlasFileName: "mix-and-match-pma.atlas", - skeletonFileName: "mix-and-match-pro.skel" - ) - try await MainActor.run { - let skins = drawable.skeletonData.skins - for i in 0.. some View { content .onDisappear { - reportLeaks() + DispatchQueue.main.async { + reportLeaks() + } } } } @@ -69,7 +71,6 @@ struct MainView: View { } NavigationLink("Dress Up") { DressUp() - .reportLeaksOnDisappear() } NavigationLink("IK Following") { IKFollowing() diff --git a/spine-ios/Example/Spine iOS Example/Physics.swift b/spine-ios/Example/Spine iOS Example/Physics.swift index c9fcb2277..564d1a921 100644 --- a/spine-ios/Example/Spine iOS Example/Physics.swift +++ b/spine-ios/Example/Spine iOS Example/Physics.swift @@ -49,6 +49,11 @@ struct Physics: View { } ) } + .onDisappear { + // SwiftUI may retain the @StateObject model after the view disappears. + // Explicit disposal is only needed here so leak reporting runs after native teardown. + model.dispose() + } .navigationTitle("Physics (drag anywhere)") .navigationBarTitleDisplayMode(.inline) } @@ -60,6 +65,14 @@ struct Physics: View { final class PhysicsModel: ObservableObject { + // Not strictly necessary for normal usage. SwiftUI will eventually release the + // model and controller. We dispose explicitly here so leak reporting runs after + // native teardown when navigating back from the example. + func dispose() { + controller.dispose() + } + + @Published var controller: SpineController! diff --git a/spine-ios/Example/Spine iOS Example/PlayPauseAnimation.swift b/spine-ios/Example/Spine iOS Example/PlayPauseAnimation.swift index a7040750a..386e85ede 100644 --- a/spine-ios/Example/Spine iOS Example/PlayPauseAnimation.swift +++ b/spine-ios/Example/Spine iOS Example/PlayPauseAnimation.swift @@ -49,6 +49,11 @@ struct PlayPauseAnimation: View { controller: controller, boundsProvider: SkinAndAnimationBounds(animation: "flying") ) + .onDisappear { + // SwiftUI may retain the @StateObject controller after the view disappears. + // Explicit disposal is only needed here so leak reporting runs after native teardown. + controller.dispose() + } .navigationTitle("Play/Pause") .navigationBarTitleDisplayMode(.inline) .toolbar { diff --git a/spine-ios/Example/Spine iOS Example/SimpleAnimation.swift b/spine-ios/Example/Spine iOS Example/SimpleAnimation.swift index a1c8ba1cf..a21c40130 100644 --- a/spine-ios/Example/Spine iOS Example/SimpleAnimation.swift +++ b/spine-ios/Example/Spine iOS Example/SimpleAnimation.swift @@ -50,6 +50,11 @@ struct SimpleAnimation: View { mode: .fit, alignment: .center ) + .onDisappear { + // SwiftUI may retain the @StateObject controller after the view disappears. + // Explicit disposal is only needed here so leak reporting runs after native teardown. + controller.dispose() + } .navigationTitle("Simple Animation") .navigationBarTitleDisplayMode(.inline) } diff --git a/spine-ios/Example/Spine iOS Example/SimpleAnimationViewController.m b/spine-ios/Example/Spine iOS Example/SimpleAnimationViewController.m index 3f96e2a21..02ef70ff7 100644 --- a/spine-ios/Example/Spine iOS Example/SimpleAnimationViewController.m +++ b/spine-ios/Example/Spine iOS Example/SimpleAnimationViewController.m @@ -33,6 +33,7 @@ @interface SimpleAnimationViewController () @property (nonatomic, strong) SpineController *spineController; +@property (nonatomic, strong) SpineUIView *spineView; @end @@ -55,19 +56,29 @@ - (void)viewDidLoad { [super viewDidLoad]; - - SpineUIView *spineView = [[SpineUIView alloc] initWithAtlasFileName:@"spineboy-pma.atlas" - skeletonFileName:@"spineboy-pro.skel" - bundle:[NSBundle mainBundle] - controller:self.spineController - mode:SpineContentModeFit - alignment:SpineAlignmentCenter - boundsProvider:[[SpineSetupPoseBounds alloc] init] - backgroundColor:[UIColor clearColor]]; - spineView.frame = self.view.bounds; - spineView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight; - - [self.view addSubview:spineView]; + + self.spineView = [[SpineUIView alloc] initWithAtlasFileName:@"spineboy-pma.atlas" + skeletonFileName:@"spineboy-pro.skel" + bundle:[NSBundle mainBundle] + controller:self.spineController + mode:SpineContentModeFit + alignment:SpineAlignmentCenter + boundsProvider:[[SpineSetupPoseBounds alloc] init] + backgroundColor:[UIColor clearColor]]; + self.spineView.frame = self.view.bounds; + self.spineView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight; + + [self.view addSubview:self.spineView]; +} + +- (void)viewDidDisappear:(BOOL)animated { + [super viewDidDisappear:animated]; + + // UIKit will eventually release the view controller and controller. We dispose + // explicitly here so leak reporting runs after native teardown when navigating back. + [self.spineController dispose]; + [self.spineView removeFromSuperview]; + self.spineView = nil; } @end diff --git a/spine-ios/Sources/SpineSwift/Generated/Animation.swift b/spine-ios/Sources/SpineSwift/Generated/Animation.swift index 7748c7d54..7c822dc15 100644 --- a/spine-ios/Sources/SpineSwift/Generated/Animation.swift +++ b/spine-ios/Sources/SpineSwift/Generated/Animation.swift @@ -53,11 +53,10 @@ public class Animation: NSObject { public var timelines: ArrayTimeline { get { let result = spine_animation_get_timelines(_ptr.assumingMemoryBound(to: spine_animation_wrapper.self)) - return ArrayTimeline(fromPointer: result!) + return ArrayTimeline(fromPointer: result!) } set { - spine_animation_set_timelines( - _ptr.assumingMemoryBound(to: spine_animation_wrapper.self), newValue._ptr.assumingMemoryBound(to: spine_array_timeline_wrapper.self)) + spine_animation_set_timelines(_ptr.assumingMemoryBound(to: spine_animation_wrapper.self), newValue._ptr.assumingMemoryBound(to: spine_array_timeline_wrapper.self)) } } @@ -67,7 +66,7 @@ public class Animation: NSObject { public var duration: Float { get { let result = spine_animation_get_duration(_ptr.assumingMemoryBound(to: spine_animation_wrapper.self)) - return result + return result } set { spine_animation_set_duration(_ptr.assumingMemoryBound(to: spine_animation_wrapper.self), newValue) @@ -88,8 +87,7 @@ public class Animation: NSObject { /// Returns true if this animation contains a timeline with any of the specified property IDs. public func hasTimeline(_ ids: ArrayPropertyId) -> Bool { - let result = spine_animation_has_timeline( - _ptr.assumingMemoryBound(to: spine_animation_wrapper.self), ids._ptr.assumingMemoryBound(to: spine_array_property_id_wrapper.self)) + let result = spine_animation_has_timeline(_ptr.assumingMemoryBound(to: spine_animation_wrapper.self), ids._ptr.assumingMemoryBound(to: spine_array_property_id_wrapper.self)) return result } @@ -105,14 +103,8 @@ public class Animation: NSObject { /// - Parameter alpha: 0 applies the current or setup values (depending on blend). 1 applies the timeline values. Between 0 and 1 applies values between the current or setup values and the timeline values. By adjusting alpha over time, an animation can be mixed in or out. alpha can also be useful to apply animations on top of each other (layering). /// - Parameter blend: Controls how mixing is applied when alpha < 1. /// - Parameter direction: Indicates whether the timelines are mixing in or out. Used by timelines which perform instant transitions, such as DrawOrderTimeline or AttachmentTimeline. - public func apply( - _ skeleton: Skeleton, _ lastTime: Float, _ time: Float, _ loop: Bool, _ events: ArrayEvent?, _ alpha: Float, _ blend: MixBlend, - _ direction: MixDirection, _ appliedPose: Bool - ) { - spine_animation_apply( - _ptr.assumingMemoryBound(to: spine_animation_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self), lastTime, - time, loop, events?._ptr.assumingMemoryBound(to: spine_array_event_wrapper.self), alpha, - spine_mix_blend(rawValue: UInt32(blend.rawValue)), spine_mix_direction(rawValue: UInt32(direction.rawValue)), appliedPose) + public func apply(_ skeleton: Skeleton, _ lastTime: Float, _ time: Float, _ loop: Bool, _ events: ArrayEvent?, _ alpha: Float, _ blend: MixBlend, _ direction: MixDirection, _ appliedPose: Bool) { + spine_animation_apply(_ptr.assumingMemoryBound(to: spine_animation_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self), lastTime, time, loop, events?._ptr.assumingMemoryBound(to: spine_array_event_wrapper.self), alpha, spine_mix_blend(rawValue: UInt32(blend.rawValue)), spine_mix_direction(rawValue: UInt32(direction.rawValue)), appliedPose) } /// - Parameter target: After the first and before the last entry. @@ -129,4 +121,4 @@ public class Animation: NSObject { public func dispose() { spine_animation_dispose(_ptr.assumingMemoryBound(to: spine_animation_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/Arrays.swift b/spine-ios/Sources/SpineSwift/Generated/Arrays.swift index 3d97da35c..6206b2371 100644 --- a/spine-ios/Sources/SpineSwift/Generated/Arrays.swift +++ b/spine-ios/Sources/SpineSwift/Generated/Arrays.swift @@ -381,8 +381,7 @@ public class ArrayAnimation: NSObject { /// Adds a value to the end of this array public func add(_ value: Animation?) { - spine_array_animation_add( - _ptr.assumingMemoryBound(to: spine_array_animation_wrapper.self), value?._ptr.assumingMemoryBound(to: spine_animation_wrapper.self)) + spine_array_animation_add(_ptr.assumingMemoryBound(to: spine_array_animation_wrapper.self), value?._ptr.assumingMemoryBound(to: spine_animation_wrapper.self)) } /// Removes all elements from this array @@ -460,8 +459,7 @@ public class ArrayAtlasPage: NSObject { /// Adds a value to the end of this array public func add(_ value: AtlasPage?) { - spine_array_atlas_page_add( - _ptr.assumingMemoryBound(to: spine_array_atlas_page_wrapper.self), value?._ptr.assumingMemoryBound(to: spine_atlas_page_wrapper.self)) + spine_array_atlas_page_add(_ptr.assumingMemoryBound(to: spine_array_atlas_page_wrapper.self), value?._ptr.assumingMemoryBound(to: spine_atlas_page_wrapper.self)) } /// Removes all elements from this array @@ -539,8 +537,7 @@ public class ArrayAtlasRegion: NSObject { /// Adds a value to the end of this array public func add(_ value: AtlasRegion?) { - spine_array_atlas_region_add( - _ptr.assumingMemoryBound(to: spine_array_atlas_region_wrapper.self), value?._ptr.assumingMemoryBound(to: spine_atlas_region_wrapper.self)) + spine_array_atlas_region_add(_ptr.assumingMemoryBound(to: spine_array_atlas_region_wrapper.self), value?._ptr.assumingMemoryBound(to: spine_atlas_region_wrapper.self)) } /// Removes all elements from this array @@ -614,36 +611,35 @@ public class ArrayAttachment: NSObject { let elementPtr = buffer[Int(index)] guard let ptr = elementPtr else { return nil } let rtti = spine_attachment_get_rtti(ptr) - let rttiClassName = String(cString: spine_rtti_get_class_name(rtti)!) - switch rttiClassName { - case "BoundingBoxAttachment": - let castedPtr = spine_attachment_cast_to_bounding_box_attachment(ptr) - return BoundingBoxAttachment(fromPointer: castedPtr!) - case "ClippingAttachment": - let castedPtr = spine_attachment_cast_to_clipping_attachment(ptr) - return ClippingAttachment(fromPointer: castedPtr!) - case "MeshAttachment": - let castedPtr = spine_attachment_cast_to_mesh_attachment(ptr) - return MeshAttachment(fromPointer: castedPtr!) - case "PathAttachment": - let castedPtr = spine_attachment_cast_to_path_attachment(ptr) - return PathAttachment(fromPointer: castedPtr!) - case "PointAttachment": - let castedPtr = spine_attachment_cast_to_point_attachment(ptr) - return PointAttachment(fromPointer: castedPtr!) - case "RegionAttachment": - let castedPtr = spine_attachment_cast_to_region_attachment(ptr) - return RegionAttachment(fromPointer: castedPtr!) - default: - fatalError("Unknown concrete type: \(rttiClassName) for abstract class Attachment") - } + let rttiClassName = String(cString: spine_rtti_get_class_name(rtti)!) + switch rttiClassName { + case "BoundingBoxAttachment": + let castedPtr = spine_attachment_cast_to_bounding_box_attachment(ptr) + return BoundingBoxAttachment(fromPointer: castedPtr!) + case "ClippingAttachment": + let castedPtr = spine_attachment_cast_to_clipping_attachment(ptr) + return ClippingAttachment(fromPointer: castedPtr!) + case "MeshAttachment": + let castedPtr = spine_attachment_cast_to_mesh_attachment(ptr) + return MeshAttachment(fromPointer: castedPtr!) + case "PathAttachment": + let castedPtr = spine_attachment_cast_to_path_attachment(ptr) + return PathAttachment(fromPointer: castedPtr!) + case "PointAttachment": + let castedPtr = spine_attachment_cast_to_point_attachment(ptr) + return PointAttachment(fromPointer: castedPtr!) + case "RegionAttachment": + let castedPtr = spine_attachment_cast_to_region_attachment(ptr) + return RegionAttachment(fromPointer: castedPtr!) + default: + fatalError("Unknown concrete type: \(rttiClassName) for abstract class Attachment") + } } } /// Adds a value to the end of this array public func add(_ value: Attachment?) { - spine_array_attachment_add( - _ptr.assumingMemoryBound(to: spine_array_attachment_wrapper.self), value?._ptr.assumingMemoryBound(to: spine_attachment_wrapper.self)) + spine_array_attachment_add(_ptr.assumingMemoryBound(to: spine_array_attachment_wrapper.self), value?._ptr.assumingMemoryBound(to: spine_attachment_wrapper.self)) } /// Removes all elements from this array @@ -721,8 +717,7 @@ public class ArrayBone: NSObject { /// Adds a value to the end of this array public func add(_ value: Bone?) { - spine_array_bone_add( - _ptr.assumingMemoryBound(to: spine_array_bone_wrapper.self), value?._ptr.assumingMemoryBound(to: spine_bone_wrapper.self)) + spine_array_bone_add(_ptr.assumingMemoryBound(to: spine_array_bone_wrapper.self), value?._ptr.assumingMemoryBound(to: spine_bone_wrapper.self)) } /// Removes all elements from this array @@ -800,8 +795,7 @@ public class ArrayBoneData: NSObject { /// Adds a value to the end of this array public func add(_ value: BoneData?) { - spine_array_bone_data_add( - _ptr.assumingMemoryBound(to: spine_array_bone_data_wrapper.self), value?._ptr.assumingMemoryBound(to: spine_bone_data_wrapper.self)) + spine_array_bone_data_add(_ptr.assumingMemoryBound(to: spine_array_bone_data_wrapper.self), value?._ptr.assumingMemoryBound(to: spine_bone_data_wrapper.self)) } /// Removes all elements from this array @@ -879,8 +873,7 @@ public class ArrayBonePose: NSObject { /// Adds a value to the end of this array public func add(_ value: BonePose?) { - spine_array_bone_pose_add( - _ptr.assumingMemoryBound(to: spine_array_bone_pose_wrapper.self), value?._ptr.assumingMemoryBound(to: spine_bone_pose_wrapper.self)) + spine_array_bone_pose_add(_ptr.assumingMemoryBound(to: spine_array_bone_pose_wrapper.self), value?._ptr.assumingMemoryBound(to: spine_bone_pose_wrapper.self)) } /// Removes all elements from this array @@ -958,9 +951,7 @@ public class ArrayBoundingBoxAttachment: NSObject { /// Adds a value to the end of this array public func add(_ value: BoundingBoxAttachment?) { - spine_array_bounding_box_attachment_add( - _ptr.assumingMemoryBound(to: spine_array_bounding_box_attachment_wrapper.self), - value?._ptr.assumingMemoryBound(to: spine_bounding_box_attachment_wrapper.self)) + spine_array_bounding_box_attachment_add(_ptr.assumingMemoryBound(to: spine_array_bounding_box_attachment_wrapper.self), value?._ptr.assumingMemoryBound(to: spine_bounding_box_attachment_wrapper.self)) } /// Removes all elements from this array @@ -981,8 +972,7 @@ public class ArrayBoundingBoxAttachment: NSObject { public var length: Int { get { count } set { - spine_array_bounding_box_attachment_set_size( - _ptr.assumingMemoryBound(to: spine_array_bounding_box_attachment_wrapper.self), newValue, nil) + spine_array_bounding_box_attachment_set_size(_ptr.assumingMemoryBound(to: spine_array_bounding_box_attachment_wrapper.self), newValue, nil) } } @@ -1035,33 +1025,32 @@ public class ArrayConstraint: NSObject { let elementPtr = buffer[Int(index)] guard let ptr = elementPtr else { return nil } let rtti = spine_constraint_get_rtti(ptr) - let rttiClassName = String(cString: spine_rtti_get_class_name(rtti)!) - switch rttiClassName { - case "IkConstraint": - let castedPtr = spine_constraint_cast_to_ik_constraint(ptr) - return IkConstraint(fromPointer: castedPtr!) - case "PathConstraint": - let castedPtr = spine_constraint_cast_to_path_constraint(ptr) - return PathConstraint(fromPointer: castedPtr!) - case "PhysicsConstraint": - let castedPtr = spine_constraint_cast_to_physics_constraint(ptr) - return PhysicsConstraint(fromPointer: castedPtr!) - case "Slider": - let castedPtr = spine_constraint_cast_to_slider(ptr) - return Slider(fromPointer: castedPtr!) - case "TransformConstraint": - let castedPtr = spine_constraint_cast_to_transform_constraint(ptr) - return TransformConstraint(fromPointer: castedPtr!) - default: - fatalError("Unknown concrete type: \(rttiClassName) for abstract class Constraint") - } + let rttiClassName = String(cString: spine_rtti_get_class_name(rtti)!) + switch rttiClassName { + case "IkConstraint": + let castedPtr = spine_constraint_cast_to_ik_constraint(ptr) + return IkConstraint(fromPointer: castedPtr!) + case "PathConstraint": + let castedPtr = spine_constraint_cast_to_path_constraint(ptr) + return PathConstraint(fromPointer: castedPtr!) + case "PhysicsConstraint": + let castedPtr = spine_constraint_cast_to_physics_constraint(ptr) + return PhysicsConstraint(fromPointer: castedPtr!) + case "Slider": + let castedPtr = spine_constraint_cast_to_slider(ptr) + return Slider(fromPointer: castedPtr!) + case "TransformConstraint": + let castedPtr = spine_constraint_cast_to_transform_constraint(ptr) + return TransformConstraint(fromPointer: castedPtr!) + default: + fatalError("Unknown concrete type: \(rttiClassName) for abstract class Constraint") + } } } /// Adds a value to the end of this array public func add(_ value: Constraint?) { - spine_array_constraint_add( - _ptr.assumingMemoryBound(to: spine_array_constraint_wrapper.self), value?._ptr.assumingMemoryBound(to: spine_constraint_wrapper.self)) + spine_array_constraint_add(_ptr.assumingMemoryBound(to: spine_array_constraint_wrapper.self), value?._ptr.assumingMemoryBound(to: spine_constraint_wrapper.self)) } /// Removes all elements from this array @@ -1135,34 +1124,32 @@ public class ArrayConstraintData: NSObject { let elementPtr = buffer[Int(index)] guard let ptr = elementPtr else { return nil } let rtti = spine_constraint_data_get_rtti(ptr) - let rttiClassName = String(cString: spine_rtti_get_class_name(rtti)!) - switch rttiClassName { - case "IkConstraintData": - let castedPtr = spine_constraint_data_cast_to_ik_constraint_data(ptr) - return IkConstraintData(fromPointer: castedPtr!) - case "PathConstraintData": - let castedPtr = spine_constraint_data_cast_to_path_constraint_data(ptr) - return PathConstraintData(fromPointer: castedPtr!) - case "PhysicsConstraintData": - let castedPtr = spine_constraint_data_cast_to_physics_constraint_data(ptr) - return PhysicsConstraintData(fromPointer: castedPtr!) - case "SliderData": - let castedPtr = spine_constraint_data_cast_to_slider_data(ptr) - return SliderData(fromPointer: castedPtr!) - case "TransformConstraintData": - let castedPtr = spine_constraint_data_cast_to_transform_constraint_data(ptr) - return TransformConstraintData(fromPointer: castedPtr!) - default: - fatalError("Unknown concrete type: \(rttiClassName) for abstract class ConstraintData") - } + let rttiClassName = String(cString: spine_rtti_get_class_name(rtti)!) + switch rttiClassName { + case "IkConstraintData": + let castedPtr = spine_constraint_data_cast_to_ik_constraint_data(ptr) + return IkConstraintData(fromPointer: castedPtr!) + case "PathConstraintData": + let castedPtr = spine_constraint_data_cast_to_path_constraint_data(ptr) + return PathConstraintData(fromPointer: castedPtr!) + case "PhysicsConstraintData": + let castedPtr = spine_constraint_data_cast_to_physics_constraint_data(ptr) + return PhysicsConstraintData(fromPointer: castedPtr!) + case "SliderData": + let castedPtr = spine_constraint_data_cast_to_slider_data(ptr) + return SliderData(fromPointer: castedPtr!) + case "TransformConstraintData": + let castedPtr = spine_constraint_data_cast_to_transform_constraint_data(ptr) + return TransformConstraintData(fromPointer: castedPtr!) + default: + fatalError("Unknown concrete type: \(rttiClassName) for abstract class ConstraintData") + } } } /// Adds a value to the end of this array public func add(_ value: ConstraintData?) { - spine_array_constraint_data_add( - _ptr.assumingMemoryBound(to: spine_array_constraint_data_wrapper.self), - value?._ptr.assumingMemoryBound(to: spine_constraint_data_wrapper.self)) + spine_array_constraint_data_add(_ptr.assumingMemoryBound(to: spine_array_constraint_data_wrapper.self), value?._ptr.assumingMemoryBound(to: spine_constraint_data_wrapper.self)) } /// Removes all elements from this array @@ -1240,8 +1227,7 @@ public class ArrayEvent: NSObject { /// Adds a value to the end of this array public func add(_ value: Event?) { - spine_array_event_add( - _ptr.assumingMemoryBound(to: spine_array_event_wrapper.self), value?._ptr.assumingMemoryBound(to: spine_event_wrapper.self)) + spine_array_event_add(_ptr.assumingMemoryBound(to: spine_array_event_wrapper.self), value?._ptr.assumingMemoryBound(to: spine_event_wrapper.self)) } /// Removes all elements from this array @@ -1319,8 +1305,7 @@ public class ArrayEventData: NSObject { /// Adds a value to the end of this array public func add(_ value: EventData?) { - spine_array_event_data_add( - _ptr.assumingMemoryBound(to: spine_array_event_data_wrapper.self), value?._ptr.assumingMemoryBound(to: spine_event_data_wrapper.self)) + spine_array_event_data_add(_ptr.assumingMemoryBound(to: spine_array_event_data_wrapper.self), value?._ptr.assumingMemoryBound(to: spine_event_data_wrapper.self)) } /// Removes all elements from this array @@ -1394,37 +1379,35 @@ public class ArrayFromProperty: NSObject { let elementPtr = buffer[Int(index)] guard let ptr = elementPtr else { return nil } let rtti = spine_from_property_get_rtti(ptr) - let rttiClassName = String(cString: spine_rtti_get_class_name(rtti)!) - switch rttiClassName { - case "FromRotate": - let castedPtr = spine_from_property_cast_to_from_rotate(ptr) - return FromRotate(fromPointer: castedPtr!) - case "FromScaleX": - let castedPtr = spine_from_property_cast_to_from_scale_x(ptr) - return FromScaleX(fromPointer: castedPtr!) - case "FromScaleY": - let castedPtr = spine_from_property_cast_to_from_scale_y(ptr) - return FromScaleY(fromPointer: castedPtr!) - case "FromShearY": - let castedPtr = spine_from_property_cast_to_from_shear_y(ptr) - return FromShearY(fromPointer: castedPtr!) - case "FromX": - let castedPtr = spine_from_property_cast_to_from_x(ptr) - return FromX(fromPointer: castedPtr!) - case "FromY": - let castedPtr = spine_from_property_cast_to_from_y(ptr) - return FromY(fromPointer: castedPtr!) - default: - fatalError("Unknown concrete type: \(rttiClassName) for abstract class FromProperty") - } + let rttiClassName = String(cString: spine_rtti_get_class_name(rtti)!) + switch rttiClassName { + case "FromRotate": + let castedPtr = spine_from_property_cast_to_from_rotate(ptr) + return FromRotate(fromPointer: castedPtr!) + case "FromScaleX": + let castedPtr = spine_from_property_cast_to_from_scale_x(ptr) + return FromScaleX(fromPointer: castedPtr!) + case "FromScaleY": + let castedPtr = spine_from_property_cast_to_from_scale_y(ptr) + return FromScaleY(fromPointer: castedPtr!) + case "FromShearY": + let castedPtr = spine_from_property_cast_to_from_shear_y(ptr) + return FromShearY(fromPointer: castedPtr!) + case "FromX": + let castedPtr = spine_from_property_cast_to_from_x(ptr) + return FromX(fromPointer: castedPtr!) + case "FromY": + let castedPtr = spine_from_property_cast_to_from_y(ptr) + return FromY(fromPointer: castedPtr!) + default: + fatalError("Unknown concrete type: \(rttiClassName) for abstract class FromProperty") + } } } /// Adds a value to the end of this array public func add(_ value: FromProperty?) { - spine_array_from_property_add( - _ptr.assumingMemoryBound(to: spine_array_from_property_wrapper.self), - value?._ptr.assumingMemoryBound(to: spine_from_property_wrapper.self)) + spine_array_from_property_add(_ptr.assumingMemoryBound(to: spine_array_from_property_wrapper.self), value?._ptr.assumingMemoryBound(to: spine_from_property_wrapper.self)) } /// Removes all elements from this array @@ -1502,9 +1485,7 @@ public class ArrayPhysicsConstraint: NSObject { /// Adds a value to the end of this array public func add(_ value: PhysicsConstraint?) { - spine_array_physics_constraint_add( - _ptr.assumingMemoryBound(to: spine_array_physics_constraint_wrapper.self), - value?._ptr.assumingMemoryBound(to: spine_physics_constraint_wrapper.self)) + spine_array_physics_constraint_add(_ptr.assumingMemoryBound(to: spine_array_physics_constraint_wrapper.self), value?._ptr.assumingMemoryBound(to: spine_physics_constraint_wrapper.self)) } /// Removes all elements from this array @@ -1582,8 +1563,7 @@ public class ArrayPolygon: NSObject { /// Adds a value to the end of this array public func add(_ value: Polygon?) { - spine_array_polygon_add( - _ptr.assumingMemoryBound(to: spine_array_polygon_wrapper.self), value?._ptr.assumingMemoryBound(to: spine_polygon_wrapper.self)) + spine_array_polygon_add(_ptr.assumingMemoryBound(to: spine_array_polygon_wrapper.self), value?._ptr.assumingMemoryBound(to: spine_polygon_wrapper.self)) } /// Removes all elements from this array @@ -1661,8 +1641,7 @@ public class ArraySkin: NSObject { /// Adds a value to the end of this array public func add(_ value: Skin?) { - spine_array_skin_add( - _ptr.assumingMemoryBound(to: spine_array_skin_wrapper.self), value?._ptr.assumingMemoryBound(to: spine_skin_wrapper.self)) + spine_array_skin_add(_ptr.assumingMemoryBound(to: spine_array_skin_wrapper.self), value?._ptr.assumingMemoryBound(to: spine_skin_wrapper.self)) } /// Removes all elements from this array @@ -1740,8 +1719,7 @@ public class ArraySlot: NSObject { /// Adds a value to the end of this array public func add(_ value: Slot?) { - spine_array_slot_add( - _ptr.assumingMemoryBound(to: spine_array_slot_wrapper.self), value?._ptr.assumingMemoryBound(to: spine_slot_wrapper.self)) + spine_array_slot_add(_ptr.assumingMemoryBound(to: spine_array_slot_wrapper.self), value?._ptr.assumingMemoryBound(to: spine_slot_wrapper.self)) } /// Removes all elements from this array @@ -1819,8 +1797,7 @@ public class ArraySlotData: NSObject { /// Adds a value to the end of this array public func add(_ value: SlotData?) { - spine_array_slot_data_add( - _ptr.assumingMemoryBound(to: spine_array_slot_data_wrapper.self), value?._ptr.assumingMemoryBound(to: spine_slot_data_wrapper.self)) + spine_array_slot_data_add(_ptr.assumingMemoryBound(to: spine_array_slot_data_wrapper.self), value?._ptr.assumingMemoryBound(to: spine_slot_data_wrapper.self)) } /// Removes all elements from this array @@ -1898,9 +1875,7 @@ public class ArrayTextureRegion: NSObject { /// Adds a value to the end of this array public func add(_ value: TextureRegion?) { - spine_array_texture_region_add( - _ptr.assumingMemoryBound(to: spine_array_texture_region_wrapper.self), - value?._ptr.assumingMemoryBound(to: spine_texture_region_wrapper.self)) + spine_array_texture_region_add(_ptr.assumingMemoryBound(to: spine_array_texture_region_wrapper.self), value?._ptr.assumingMemoryBound(to: spine_texture_region_wrapper.self)) } /// Removes all elements from this array @@ -1974,126 +1949,125 @@ public class ArrayTimeline: NSObject { let elementPtr = buffer[Int(index)] guard let ptr = elementPtr else { return nil } let rtti = spine_timeline_get_rtti(ptr) - let rttiClassName = String(cString: spine_rtti_get_class_name(rtti)!) - switch rttiClassName { - case "AlphaTimeline": - let castedPtr = spine_timeline_cast_to_alpha_timeline(ptr) - return AlphaTimeline(fromPointer: castedPtr!) - case "AttachmentTimeline": - let castedPtr = spine_timeline_cast_to_attachment_timeline(ptr) - return AttachmentTimeline(fromPointer: castedPtr!) - case "DeformTimeline": - let castedPtr = spine_timeline_cast_to_deform_timeline(ptr) - return DeformTimeline(fromPointer: castedPtr!) - case "DrawOrderTimeline": - let castedPtr = spine_timeline_cast_to_draw_order_timeline(ptr) - return DrawOrderTimeline(fromPointer: castedPtr!) - case "EventTimeline": - let castedPtr = spine_timeline_cast_to_event_timeline(ptr) - return EventTimeline(fromPointer: castedPtr!) - case "IkConstraintTimeline": - let castedPtr = spine_timeline_cast_to_ik_constraint_timeline(ptr) - return IkConstraintTimeline(fromPointer: castedPtr!) - case "InheritTimeline": - let castedPtr = spine_timeline_cast_to_inherit_timeline(ptr) - return InheritTimeline(fromPointer: castedPtr!) - case "PathConstraintMixTimeline": - let castedPtr = spine_timeline_cast_to_path_constraint_mix_timeline(ptr) - return PathConstraintMixTimeline(fromPointer: castedPtr!) - case "PathConstraintPositionTimeline": - let castedPtr = spine_timeline_cast_to_path_constraint_position_timeline(ptr) - return PathConstraintPositionTimeline(fromPointer: castedPtr!) - case "PathConstraintSpacingTimeline": - let castedPtr = spine_timeline_cast_to_path_constraint_spacing_timeline(ptr) - return PathConstraintSpacingTimeline(fromPointer: castedPtr!) - case "PhysicsConstraintDampingTimeline": - let castedPtr = spine_timeline_cast_to_physics_constraint_damping_timeline(ptr) - return PhysicsConstraintDampingTimeline(fromPointer: castedPtr!) - case "PhysicsConstraintGravityTimeline": - let castedPtr = spine_timeline_cast_to_physics_constraint_gravity_timeline(ptr) - return PhysicsConstraintGravityTimeline(fromPointer: castedPtr!) - case "PhysicsConstraintInertiaTimeline": - let castedPtr = spine_timeline_cast_to_physics_constraint_inertia_timeline(ptr) - return PhysicsConstraintInertiaTimeline(fromPointer: castedPtr!) - case "PhysicsConstraintMassTimeline": - let castedPtr = spine_timeline_cast_to_physics_constraint_mass_timeline(ptr) - return PhysicsConstraintMassTimeline(fromPointer: castedPtr!) - case "PhysicsConstraintMixTimeline": - let castedPtr = spine_timeline_cast_to_physics_constraint_mix_timeline(ptr) - return PhysicsConstraintMixTimeline(fromPointer: castedPtr!) - case "PhysicsConstraintResetTimeline": - let castedPtr = spine_timeline_cast_to_physics_constraint_reset_timeline(ptr) - return PhysicsConstraintResetTimeline(fromPointer: castedPtr!) - case "PhysicsConstraintStrengthTimeline": - let castedPtr = spine_timeline_cast_to_physics_constraint_strength_timeline(ptr) - return PhysicsConstraintStrengthTimeline(fromPointer: castedPtr!) - case "PhysicsConstraintWindTimeline": - let castedPtr = spine_timeline_cast_to_physics_constraint_wind_timeline(ptr) - return PhysicsConstraintWindTimeline(fromPointer: castedPtr!) - case "Rgb2Timeline": - let castedPtr = spine_timeline_cast_to_rgb2_timeline(ptr) - return Rgb2Timeline(fromPointer: castedPtr!) - case "Rgba2Timeline": - let castedPtr = spine_timeline_cast_to_rgba2_timeline(ptr) - return Rgba2Timeline(fromPointer: castedPtr!) - case "RgbaTimeline": - let castedPtr = spine_timeline_cast_to_rgba_timeline(ptr) - return RgbaTimeline(fromPointer: castedPtr!) - case "RgbTimeline": - let castedPtr = spine_timeline_cast_to_rgb_timeline(ptr) - return RgbTimeline(fromPointer: castedPtr!) - case "RotateTimeline": - let castedPtr = spine_timeline_cast_to_rotate_timeline(ptr) - return RotateTimeline(fromPointer: castedPtr!) - case "ScaleTimeline": - let castedPtr = spine_timeline_cast_to_scale_timeline(ptr) - return ScaleTimeline(fromPointer: castedPtr!) - case "ScaleXTimeline": - let castedPtr = spine_timeline_cast_to_scale_x_timeline(ptr) - return ScaleXTimeline(fromPointer: castedPtr!) - case "ScaleYTimeline": - let castedPtr = spine_timeline_cast_to_scale_y_timeline(ptr) - return ScaleYTimeline(fromPointer: castedPtr!) - case "SequenceTimeline": - let castedPtr = spine_timeline_cast_to_sequence_timeline(ptr) - return SequenceTimeline(fromPointer: castedPtr!) - case "ShearTimeline": - let castedPtr = spine_timeline_cast_to_shear_timeline(ptr) - return ShearTimeline(fromPointer: castedPtr!) - case "ShearXTimeline": - let castedPtr = spine_timeline_cast_to_shear_x_timeline(ptr) - return ShearXTimeline(fromPointer: castedPtr!) - case "ShearYTimeline": - let castedPtr = spine_timeline_cast_to_shear_y_timeline(ptr) - return ShearYTimeline(fromPointer: castedPtr!) - case "SliderMixTimeline": - let castedPtr = spine_timeline_cast_to_slider_mix_timeline(ptr) - return SliderMixTimeline(fromPointer: castedPtr!) - case "SliderTimeline": - let castedPtr = spine_timeline_cast_to_slider_timeline(ptr) - return SliderTimeline(fromPointer: castedPtr!) - case "TransformConstraintTimeline": - let castedPtr = spine_timeline_cast_to_transform_constraint_timeline(ptr) - return TransformConstraintTimeline(fromPointer: castedPtr!) - case "TranslateTimeline": - let castedPtr = spine_timeline_cast_to_translate_timeline(ptr) - return TranslateTimeline(fromPointer: castedPtr!) - case "TranslateXTimeline": - let castedPtr = spine_timeline_cast_to_translate_x_timeline(ptr) - return TranslateXTimeline(fromPointer: castedPtr!) - case "TranslateYTimeline": - let castedPtr = spine_timeline_cast_to_translate_y_timeline(ptr) - return TranslateYTimeline(fromPointer: castedPtr!) - default: - fatalError("Unknown concrete type: \(rttiClassName) for abstract class Timeline") - } + let rttiClassName = String(cString: spine_rtti_get_class_name(rtti)!) + switch rttiClassName { + case "AlphaTimeline": + let castedPtr = spine_timeline_cast_to_alpha_timeline(ptr) + return AlphaTimeline(fromPointer: castedPtr!) + case "AttachmentTimeline": + let castedPtr = spine_timeline_cast_to_attachment_timeline(ptr) + return AttachmentTimeline(fromPointer: castedPtr!) + case "DeformTimeline": + let castedPtr = spine_timeline_cast_to_deform_timeline(ptr) + return DeformTimeline(fromPointer: castedPtr!) + case "DrawOrderTimeline": + let castedPtr = spine_timeline_cast_to_draw_order_timeline(ptr) + return DrawOrderTimeline(fromPointer: castedPtr!) + case "EventTimeline": + let castedPtr = spine_timeline_cast_to_event_timeline(ptr) + return EventTimeline(fromPointer: castedPtr!) + case "IkConstraintTimeline": + let castedPtr = spine_timeline_cast_to_ik_constraint_timeline(ptr) + return IkConstraintTimeline(fromPointer: castedPtr!) + case "InheritTimeline": + let castedPtr = spine_timeline_cast_to_inherit_timeline(ptr) + return InheritTimeline(fromPointer: castedPtr!) + case "PathConstraintMixTimeline": + let castedPtr = spine_timeline_cast_to_path_constraint_mix_timeline(ptr) + return PathConstraintMixTimeline(fromPointer: castedPtr!) + case "PathConstraintPositionTimeline": + let castedPtr = spine_timeline_cast_to_path_constraint_position_timeline(ptr) + return PathConstraintPositionTimeline(fromPointer: castedPtr!) + case "PathConstraintSpacingTimeline": + let castedPtr = spine_timeline_cast_to_path_constraint_spacing_timeline(ptr) + return PathConstraintSpacingTimeline(fromPointer: castedPtr!) + case "PhysicsConstraintDampingTimeline": + let castedPtr = spine_timeline_cast_to_physics_constraint_damping_timeline(ptr) + return PhysicsConstraintDampingTimeline(fromPointer: castedPtr!) + case "PhysicsConstraintGravityTimeline": + let castedPtr = spine_timeline_cast_to_physics_constraint_gravity_timeline(ptr) + return PhysicsConstraintGravityTimeline(fromPointer: castedPtr!) + case "PhysicsConstraintInertiaTimeline": + let castedPtr = spine_timeline_cast_to_physics_constraint_inertia_timeline(ptr) + return PhysicsConstraintInertiaTimeline(fromPointer: castedPtr!) + case "PhysicsConstraintMassTimeline": + let castedPtr = spine_timeline_cast_to_physics_constraint_mass_timeline(ptr) + return PhysicsConstraintMassTimeline(fromPointer: castedPtr!) + case "PhysicsConstraintMixTimeline": + let castedPtr = spine_timeline_cast_to_physics_constraint_mix_timeline(ptr) + return PhysicsConstraintMixTimeline(fromPointer: castedPtr!) + case "PhysicsConstraintResetTimeline": + let castedPtr = spine_timeline_cast_to_physics_constraint_reset_timeline(ptr) + return PhysicsConstraintResetTimeline(fromPointer: castedPtr!) + case "PhysicsConstraintStrengthTimeline": + let castedPtr = spine_timeline_cast_to_physics_constraint_strength_timeline(ptr) + return PhysicsConstraintStrengthTimeline(fromPointer: castedPtr!) + case "PhysicsConstraintWindTimeline": + let castedPtr = spine_timeline_cast_to_physics_constraint_wind_timeline(ptr) + return PhysicsConstraintWindTimeline(fromPointer: castedPtr!) + case "Rgb2Timeline": + let castedPtr = spine_timeline_cast_to_rgb2_timeline(ptr) + return Rgb2Timeline(fromPointer: castedPtr!) + case "Rgba2Timeline": + let castedPtr = spine_timeline_cast_to_rgba2_timeline(ptr) + return Rgba2Timeline(fromPointer: castedPtr!) + case "RgbaTimeline": + let castedPtr = spine_timeline_cast_to_rgba_timeline(ptr) + return RgbaTimeline(fromPointer: castedPtr!) + case "RgbTimeline": + let castedPtr = spine_timeline_cast_to_rgb_timeline(ptr) + return RgbTimeline(fromPointer: castedPtr!) + case "RotateTimeline": + let castedPtr = spine_timeline_cast_to_rotate_timeline(ptr) + return RotateTimeline(fromPointer: castedPtr!) + case "ScaleTimeline": + let castedPtr = spine_timeline_cast_to_scale_timeline(ptr) + return ScaleTimeline(fromPointer: castedPtr!) + case "ScaleXTimeline": + let castedPtr = spine_timeline_cast_to_scale_x_timeline(ptr) + return ScaleXTimeline(fromPointer: castedPtr!) + case "ScaleYTimeline": + let castedPtr = spine_timeline_cast_to_scale_y_timeline(ptr) + return ScaleYTimeline(fromPointer: castedPtr!) + case "SequenceTimeline": + let castedPtr = spine_timeline_cast_to_sequence_timeline(ptr) + return SequenceTimeline(fromPointer: castedPtr!) + case "ShearTimeline": + let castedPtr = spine_timeline_cast_to_shear_timeline(ptr) + return ShearTimeline(fromPointer: castedPtr!) + case "ShearXTimeline": + let castedPtr = spine_timeline_cast_to_shear_x_timeline(ptr) + return ShearXTimeline(fromPointer: castedPtr!) + case "ShearYTimeline": + let castedPtr = spine_timeline_cast_to_shear_y_timeline(ptr) + return ShearYTimeline(fromPointer: castedPtr!) + case "SliderMixTimeline": + let castedPtr = spine_timeline_cast_to_slider_mix_timeline(ptr) + return SliderMixTimeline(fromPointer: castedPtr!) + case "SliderTimeline": + let castedPtr = spine_timeline_cast_to_slider_timeline(ptr) + return SliderTimeline(fromPointer: castedPtr!) + case "TransformConstraintTimeline": + let castedPtr = spine_timeline_cast_to_transform_constraint_timeline(ptr) + return TransformConstraintTimeline(fromPointer: castedPtr!) + case "TranslateTimeline": + let castedPtr = spine_timeline_cast_to_translate_timeline(ptr) + return TranslateTimeline(fromPointer: castedPtr!) + case "TranslateXTimeline": + let castedPtr = spine_timeline_cast_to_translate_x_timeline(ptr) + return TranslateXTimeline(fromPointer: castedPtr!) + case "TranslateYTimeline": + let castedPtr = spine_timeline_cast_to_translate_y_timeline(ptr) + return TranslateYTimeline(fromPointer: castedPtr!) + default: + fatalError("Unknown concrete type: \(rttiClassName) for abstract class Timeline") + } } } /// Adds a value to the end of this array public func add(_ value: Timeline?) { - spine_array_timeline_add( - _ptr.assumingMemoryBound(to: spine_array_timeline_wrapper.self), value?._ptr.assumingMemoryBound(to: spine_timeline_wrapper.self)) + spine_array_timeline_add(_ptr.assumingMemoryBound(to: spine_array_timeline_wrapper.self), value?._ptr.assumingMemoryBound(to: spine_timeline_wrapper.self)) } /// Removes all elements from this array @@ -2167,36 +2141,35 @@ public class ArrayToProperty: NSObject { let elementPtr = buffer[Int(index)] guard let ptr = elementPtr else { return nil } let rtti = spine_to_property_get_rtti(ptr) - let rttiClassName = String(cString: spine_rtti_get_class_name(rtti)!) - switch rttiClassName { - case "ToRotate": - let castedPtr = spine_to_property_cast_to_to_rotate(ptr) - return ToRotate(fromPointer: castedPtr!) - case "ToScaleX": - let castedPtr = spine_to_property_cast_to_to_scale_x(ptr) - return ToScaleX(fromPointer: castedPtr!) - case "ToScaleY": - let castedPtr = spine_to_property_cast_to_to_scale_y(ptr) - return ToScaleY(fromPointer: castedPtr!) - case "ToShearY": - let castedPtr = spine_to_property_cast_to_to_shear_y(ptr) - return ToShearY(fromPointer: castedPtr!) - case "ToX": - let castedPtr = spine_to_property_cast_to_to_x(ptr) - return ToX(fromPointer: castedPtr!) - case "ToY": - let castedPtr = spine_to_property_cast_to_to_y(ptr) - return ToY(fromPointer: castedPtr!) - default: - fatalError("Unknown concrete type: \(rttiClassName) for abstract class ToProperty") - } + let rttiClassName = String(cString: spine_rtti_get_class_name(rtti)!) + switch rttiClassName { + case "ToRotate": + let castedPtr = spine_to_property_cast_to_to_rotate(ptr) + return ToRotate(fromPointer: castedPtr!) + case "ToScaleX": + let castedPtr = spine_to_property_cast_to_to_scale_x(ptr) + return ToScaleX(fromPointer: castedPtr!) + case "ToScaleY": + let castedPtr = spine_to_property_cast_to_to_scale_y(ptr) + return ToScaleY(fromPointer: castedPtr!) + case "ToShearY": + let castedPtr = spine_to_property_cast_to_to_shear_y(ptr) + return ToShearY(fromPointer: castedPtr!) + case "ToX": + let castedPtr = spine_to_property_cast_to_to_x(ptr) + return ToX(fromPointer: castedPtr!) + case "ToY": + let castedPtr = spine_to_property_cast_to_to_y(ptr) + return ToY(fromPointer: castedPtr!) + default: + fatalError("Unknown concrete type: \(rttiClassName) for abstract class ToProperty") + } } } /// Adds a value to the end of this array public func add(_ value: ToProperty?) { - spine_array_to_property_add( - _ptr.assumingMemoryBound(to: spine_array_to_property_wrapper.self), value?._ptr.assumingMemoryBound(to: spine_to_property_wrapper.self)) + spine_array_to_property_add(_ptr.assumingMemoryBound(to: spine_array_to_property_wrapper.self), value?._ptr.assumingMemoryBound(to: spine_to_property_wrapper.self)) } /// Removes all elements from this array @@ -2274,8 +2247,7 @@ public class ArrayTrackEntry: NSObject { /// Adds a value to the end of this array public func add(_ value: TrackEntry?) { - spine_array_track_entry_add( - _ptr.assumingMemoryBound(to: spine_array_track_entry_wrapper.self), value?._ptr.assumingMemoryBound(to: spine_track_entry_wrapper.self)) + spine_array_track_entry_add(_ptr.assumingMemoryBound(to: spine_array_track_entry_wrapper.self), value?._ptr.assumingMemoryBound(to: spine_track_entry_wrapper.self)) } /// Removes all elements from this array @@ -2349,39 +2321,38 @@ public class ArrayUpdate: NSObject { let elementPtr = buffer[Int(index)] guard let ptr = elementPtr else { return nil } let rtti = spine_update_get_rtti(ptr) - let rttiClassName = String(cString: spine_rtti_get_class_name(rtti)!) - switch rttiClassName { - case "Bone": - let castedPtr = spine_update_cast_to_bone(ptr) - return Bone(fromPointer: castedPtr!) - case "BonePose": - let castedPtr = spine_update_cast_to_bone_pose(ptr) - return BonePose(fromPointer: castedPtr!) - case "IkConstraint": - let castedPtr = spine_update_cast_to_ik_constraint(ptr) - return IkConstraint(fromPointer: castedPtr!) - case "PathConstraint": - let castedPtr = spine_update_cast_to_path_constraint(ptr) - return PathConstraint(fromPointer: castedPtr!) - case "PhysicsConstraint": - let castedPtr = spine_update_cast_to_physics_constraint(ptr) - return PhysicsConstraint(fromPointer: castedPtr!) - case "Slider": - let castedPtr = spine_update_cast_to_slider(ptr) - return Slider(fromPointer: castedPtr!) - case "TransformConstraint": - let castedPtr = spine_update_cast_to_transform_constraint(ptr) - return TransformConstraint(fromPointer: castedPtr!) - default: - fatalError("Unknown concrete type: \(rttiClassName) for abstract class Update") - } + let rttiClassName = String(cString: spine_rtti_get_class_name(rtti)!) + switch rttiClassName { + case "Bone": + let castedPtr = spine_update_cast_to_bone(ptr) + return Bone(fromPointer: castedPtr!) + case "BonePose": + let castedPtr = spine_update_cast_to_bone_pose(ptr) + return BonePose(fromPointer: castedPtr!) + case "IkConstraint": + let castedPtr = spine_update_cast_to_ik_constraint(ptr) + return IkConstraint(fromPointer: castedPtr!) + case "PathConstraint": + let castedPtr = spine_update_cast_to_path_constraint(ptr) + return PathConstraint(fromPointer: castedPtr!) + case "PhysicsConstraint": + let castedPtr = spine_update_cast_to_physics_constraint(ptr) + return PhysicsConstraint(fromPointer: castedPtr!) + case "Slider": + let castedPtr = spine_update_cast_to_slider(ptr) + return Slider(fromPointer: castedPtr!) + case "TransformConstraint": + let castedPtr = spine_update_cast_to_transform_constraint(ptr) + return TransformConstraint(fromPointer: castedPtr!) + default: + fatalError("Unknown concrete type: \(rttiClassName) for abstract class Update") + } } } /// Adds a value to the end of this array public func add(_ value: Update?) { - spine_array_update_add( - _ptr.assumingMemoryBound(to: spine_array_update_wrapper.self), value?._ptr.assumingMemoryBound(to: spine_update_wrapper.self)) + spine_array_update_add(_ptr.assumingMemoryBound(to: spine_array_update_wrapper.self), value?._ptr.assumingMemoryBound(to: spine_update_wrapper.self)) } /// Removes all elements from this array @@ -2416,4 +2387,4 @@ public class ArrayUpdate: NSObject { spine_array_update_dispose(_ptr.assumingMemoryBound(to: spine_array_update_wrapper.self)) } } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/Atlas.swift b/spine-ios/Sources/SpineSwift/Generated/Atlas.swift index 033defa57..7e42d1dfc 100644 --- a/spine-ios/Sources/SpineSwift/Generated/Atlas.swift +++ b/spine-ios/Sources/SpineSwift/Generated/Atlas.swift @@ -70,4 +70,4 @@ public class Atlas: NSObject { public func dispose() { spine_atlas_dispose(_ptr.assumingMemoryBound(to: spine_atlas_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/Attachment.swift b/spine-ios/Sources/SpineSwift/Generated/Attachment.swift index bbd2ab8a7..ca33b50f4 100644 --- a/spine-ios/Sources/SpineSwift/Generated/Attachment.swift +++ b/spine-ios/Sources/SpineSwift/Generated/Attachment.swift @@ -99,4 +99,4 @@ open class Attachment: NSObject { return Rtti(fromPointer: result!) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/Bone.swift b/spine-ios/Sources/SpineSwift/Generated/Bone.swift index ddac06ccb..dcb493026 100644 --- a/spine-ios/Sources/SpineSwift/Generated/Bone.swift +++ b/spine-ios/Sources/SpineSwift/Generated/Bone.swift @@ -48,15 +48,13 @@ public class Bone: PosedActive, Posed, Update { /// - Parameter parent: May be NULL. public convenience init(_ data: BoneData, _ parent: Bone?) { - let ptr = spine_bone_create( - data._ptr.assumingMemoryBound(to: spine_bone_data_wrapper.self), parent?._ptr.assumingMemoryBound(to: spine_bone_wrapper.self)) + let ptr = spine_bone_create(data._ptr.assumingMemoryBound(to: spine_bone_data_wrapper.self), parent?._ptr.assumingMemoryBound(to: spine_bone_wrapper.self)) self.init(fromPointer: ptr!) } /// Copy constructor. Does not copy the children bones. public static func from(_ bone: Bone, _ parent: Bone?) -> Bone { - let ptr = spine_bone_create2( - bone._ptr.assumingMemoryBound(to: spine_bone_wrapper.self), parent?._ptr.assumingMemoryBound(to: spine_bone_wrapper.self)) + let ptr = spine_bone_create2(bone._ptr.assumingMemoryBound(to: spine_bone_wrapper.self), parent?._ptr.assumingMemoryBound(to: spine_bone_wrapper.self)) return Bone(fromPointer: ptr!) } @@ -108,9 +106,7 @@ public class Bone: PosedActive, Posed, Update { } public func update(_ skeleton: Skeleton, _ physics: Physics) { - spine_bone_update( - _ptr.assumingMemoryBound(to: spine_bone_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self), - spine_physics(rawValue: UInt32(physics.rawValue))) + spine_bone_update(_ptr.assumingMemoryBound(to: spine_bone_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self), spine_physics(rawValue: UInt32(physics.rawValue))) } public func resetConstrained() { @@ -129,4 +125,4 @@ public class Bone: PosedActive, Posed, Update { public override func dispose() { spine_bone_dispose(_ptr.assumingMemoryBound(to: spine_bone_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/Color.swift b/spine-ios/Sources/SpineSwift/Generated/Color.swift index 5d93dc95c..1c19e0b73 100644 --- a/spine-ios/Sources/SpineSwift/Generated/Color.swift +++ b/spine-ios/Sources/SpineSwift/Generated/Color.swift @@ -56,7 +56,7 @@ public class Color: NSObject { public var r: Float { get { let result = spine_color_get_r(_ptr.assumingMemoryBound(to: spine_color_wrapper.self)) - return result + return result } set { spine_color_set_r(_ptr.assumingMemoryBound(to: spine_color_wrapper.self), newValue) @@ -66,7 +66,7 @@ public class Color: NSObject { public var g: Float { get { let result = spine_color_get_g(_ptr.assumingMemoryBound(to: spine_color_wrapper.self)) - return result + return result } set { spine_color_set_g(_ptr.assumingMemoryBound(to: spine_color_wrapper.self), newValue) @@ -76,7 +76,7 @@ public class Color: NSObject { public var b: Float { get { let result = spine_color_get_b(_ptr.assumingMemoryBound(to: spine_color_wrapper.self)) - return result + return result } set { spine_color_set_b(_ptr.assumingMemoryBound(to: spine_color_wrapper.self), newValue) @@ -86,7 +86,7 @@ public class Color: NSObject { public var a: Float { get { let result = spine_color_get_a(_ptr.assumingMemoryBound(to: spine_color_wrapper.self)) - return result + return result } set { spine_color_set_a(_ptr.assumingMemoryBound(to: spine_color_wrapper.self), newValue) @@ -124,8 +124,7 @@ public class Color: NSObject { } public func set3(_ other: Color) -> Color { - let result = spine_color_set_3( - _ptr.assumingMemoryBound(to: spine_color_wrapper.self), other._ptr.assumingMemoryBound(to: spine_color_wrapper.self)) + let result = spine_color_set_3(_ptr.assumingMemoryBound(to: spine_color_wrapper.self), other._ptr.assumingMemoryBound(to: spine_color_wrapper.self)) return Color(fromPointer: result!) } @@ -140,12 +139,11 @@ public class Color: NSObject { } public func add3(_ other: Color) -> Color { - let result = spine_color_add_3( - _ptr.assumingMemoryBound(to: spine_color_wrapper.self), other._ptr.assumingMemoryBound(to: spine_color_wrapper.self)) + let result = spine_color_add_3(_ptr.assumingMemoryBound(to: spine_color_wrapper.self), other._ptr.assumingMemoryBound(to: spine_color_wrapper.self)) return Color(fromPointer: result!) } public func dispose() { spine_color_dispose(_ptr.assumingMemoryBound(to: spine_color_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/Constraint.swift b/spine-ios/Sources/SpineSwift/Generated/Constraint.swift index b42fc8bac..b1e4706c1 100644 --- a/spine-ios/Sources/SpineSwift/Generated/Constraint.swift +++ b/spine-ios/Sources/SpineSwift/Generated/Constraint.swift @@ -41,4 +41,4 @@ public protocol Constraint: Update { func sort(_ skeleton: Skeleton) func update(_ skeleton: Skeleton, _ physics: Physics) static func rttiStatic() -> Rtti -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/Event.swift b/spine-ios/Sources/SpineSwift/Generated/Event.swift index 293c1f0ff..ca5825f3c 100644 --- a/spine-ios/Sources/SpineSwift/Generated/Event.swift +++ b/spine-ios/Sources/SpineSwift/Generated/Event.swift @@ -68,7 +68,7 @@ public class Event: NSObject { public var intValue: Int32 { get { let result = spine_event_get_int(_ptr.assumingMemoryBound(to: spine_event_wrapper.self)) - return result + return result } set { spine_event_set_int(_ptr.assumingMemoryBound(to: spine_event_wrapper.self), newValue) @@ -78,7 +78,7 @@ public class Event: NSObject { public var floatValue: Float { get { let result = spine_event_get_float(_ptr.assumingMemoryBound(to: spine_event_wrapper.self)) - return result + return result } set { spine_event_set_float(_ptr.assumingMemoryBound(to: spine_event_wrapper.self), newValue) @@ -88,7 +88,7 @@ public class Event: NSObject { public var stringValue: String { get { let result = spine_event_get_string(_ptr.assumingMemoryBound(to: spine_event_wrapper.self)) - return String(cString: result!) + return String(cString: result!) } set { spine_event_set_string(_ptr.assumingMemoryBound(to: spine_event_wrapper.self), newValue) @@ -98,7 +98,7 @@ public class Event: NSObject { public var volume: Float { get { let result = spine_event_get_volume(_ptr.assumingMemoryBound(to: spine_event_wrapper.self)) - return result + return result } set { spine_event_set_volume(_ptr.assumingMemoryBound(to: spine_event_wrapper.self), newValue) @@ -108,7 +108,7 @@ public class Event: NSObject { public var balance: Float { get { let result = spine_event_get_balance(_ptr.assumingMemoryBound(to: spine_event_wrapper.self)) - return result + return result } set { spine_event_set_balance(_ptr.assumingMemoryBound(to: spine_event_wrapper.self), newValue) @@ -118,4 +118,4 @@ public class Event: NSObject { public func dispose() { spine_event_dispose(_ptr.assumingMemoryBound(to: spine_event_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/Polygon.swift b/spine-ios/Sources/SpineSwift/Generated/Polygon.swift index c2d0c23a8..1c2fb772e 100644 --- a/spine-ios/Sources/SpineSwift/Generated/Polygon.swift +++ b/spine-ios/Sources/SpineSwift/Generated/Polygon.swift @@ -51,18 +51,17 @@ public class Polygon: NSObject { public var vertices: ArrayFloat { get { let result = spine_polygon_get__vertices(_ptr.assumingMemoryBound(to: spine_polygon_wrapper.self)) - return ArrayFloat(fromPointer: result!) + return ArrayFloat(fromPointer: result!) } set { - spine_polygon_set__vertices( - _ptr.assumingMemoryBound(to: spine_polygon_wrapper.self), newValue._ptr.assumingMemoryBound(to: spine_array_float_wrapper.self)) + spine_polygon_set__vertices(_ptr.assumingMemoryBound(to: spine_polygon_wrapper.self), newValue._ptr.assumingMemoryBound(to: spine_array_float_wrapper.self)) } } public var count: Int32 { get { let result = spine_polygon_get__count(_ptr.assumingMemoryBound(to: spine_polygon_wrapper.self)) - return result + return result } set { spine_polygon_set__count(_ptr.assumingMemoryBound(to: spine_polygon_wrapper.self), newValue) @@ -72,4 +71,4 @@ public class Polygon: NSObject { public func dispose() { spine_polygon_dispose(_ptr.assumingMemoryBound(to: spine_polygon_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/Posed.swift b/spine-ios/Sources/SpineSwift/Generated/Posed.swift index 21e129f53..8a85c424e 100644 --- a/spine-ios/Sources/SpineSwift/Generated/Posed.swift +++ b/spine-ios/Sources/SpineSwift/Generated/Posed.swift @@ -38,4 +38,4 @@ public protocol Posed { var isPoseEqualToApplied: Bool { get } func constrained() func resetConstrained() -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/Rtti.swift b/spine-ios/Sources/SpineSwift/Generated/Rtti.swift index 0258d752b..934acd7e5 100644 --- a/spine-ios/Sources/SpineSwift/Generated/Rtti.swift +++ b/spine-ios/Sources/SpineSwift/Generated/Rtti.swift @@ -49,18 +49,16 @@ public class Rtti: NSObject { } public func isExactly(_ rtti: Rtti) -> Bool { - let result = spine_rtti_is_exactly( - _ptr.assumingMemoryBound(to: spine_rtti_wrapper.self), rtti._ptr.assumingMemoryBound(to: spine_rtti_wrapper.self)) + let result = spine_rtti_is_exactly(_ptr.assumingMemoryBound(to: spine_rtti_wrapper.self), rtti._ptr.assumingMemoryBound(to: spine_rtti_wrapper.self)) return result } public func instanceOf(_ rtti: Rtti) -> Bool { - let result = spine_rtti_instance_of( - _ptr.assumingMemoryBound(to: spine_rtti_wrapper.self), rtti._ptr.assumingMemoryBound(to: spine_rtti_wrapper.self)) + let result = spine_rtti_instance_of(_ptr.assumingMemoryBound(to: spine_rtti_wrapper.self), rtti._ptr.assumingMemoryBound(to: spine_rtti_wrapper.self)) return result } public func dispose() { spine_rtti_dispose(_ptr.assumingMemoryBound(to: spine_rtti_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/Sequence.swift b/spine-ios/Sources/SpineSwift/Generated/Sequence.swift index 3ce149fb1..9b71badde 100644 --- a/spine-ios/Sources/SpineSwift/Generated/Sequence.swift +++ b/spine-ios/Sources/SpineSwift/Generated/Sequence.swift @@ -32,7 +32,8 @@ import Foundation import SpineC -/// Sequence wrapper +/// Holds texture regions, UVs, and vertex offsets for rendering a region or mesh attachment. +/// Regions must be populated and update() called before use. @objc(SpineSequence) @objcMembers public class Sequence: NSObject { @@ -43,26 +44,26 @@ public class Sequence: NSObject { super.init() } - public convenience init(_ count: Int32) { - let ptr = spine_sequence_create(count) + public convenience init(_ count: Int32, _ pathSuffix: Bool) { + let ptr = spine_sequence_create(count, pathSuffix) self.init(fromPointer: ptr!) } - /// Returns a unique ID for this attachment. - public var id: Int32 { - get { - let result = spine_sequence_get_id(_ptr.assumingMemoryBound(to: spine_sequence_wrapper.self)) - return result - } - set { - spine_sequence_set_id(_ptr.assumingMemoryBound(to: spine_sequence_wrapper.self), newValue) - } + /// Copy constructor. + public static func from(_ other: Sequence) -> Sequence { + let ptr = spine_sequence_create2(other._ptr.assumingMemoryBound(to: spine_sequence_wrapper.self)) + return Sequence(fromPointer: ptr!) + } + + public var regions: ArrayTextureRegion { + let result = spine_sequence_get_regions(_ptr.assumingMemoryBound(to: spine_sequence_wrapper.self)) + return ArrayTextureRegion(fromPointer: result!) } public var start: Int32 { get { let result = spine_sequence_get_start(_ptr.assumingMemoryBound(to: spine_sequence_wrapper.self)) - return result + return result } set { spine_sequence_set_start(_ptr.assumingMemoryBound(to: spine_sequence_wrapper.self), newValue) @@ -72,7 +73,7 @@ public class Sequence: NSObject { public var digits: Int32 { get { let result = spine_sequence_get_digits(_ptr.assumingMemoryBound(to: spine_sequence_wrapper.self)) - return result + return result } set { spine_sequence_set_digits(_ptr.assumingMemoryBound(to: spine_sequence_wrapper.self), newValue) @@ -83,27 +84,44 @@ public class Sequence: NSObject { public var setupIndex: Int32 { get { let result = spine_sequence_get_setup_index(_ptr.assumingMemoryBound(to: spine_sequence_wrapper.self)) - return result + return result } set { spine_sequence_set_setup_index(_ptr.assumingMemoryBound(to: spine_sequence_wrapper.self), newValue) } } - public var regions: ArrayTextureRegion { - let result = spine_sequence_get_regions(_ptr.assumingMemoryBound(to: spine_sequence_wrapper.self)) - return ArrayTextureRegion(fromPointer: result!) + public var pathSuffix: Bool { + let result = spine_sequence_get_path_suffix(_ptr.assumingMemoryBound(to: spine_sequence_wrapper.self)) + return result } - public func copyAttachment() -> Sequence { - let result = spine_sequence_copy(_ptr.assumingMemoryBound(to: spine_sequence_wrapper.self)) - return Sequence(fromPointer: result!) + /// Returns a unique ID for this attachment. + public var id: Int32 { + let result = spine_sequence_get_id(_ptr.assumingMemoryBound(to: spine_sequence_wrapper.self)) + return result } - public func apply(_ slot: SlotPose?, _ attachment: Attachment?) { - spine_sequence_apply( - _ptr.assumingMemoryBound(to: spine_sequence_wrapper.self), slot?._ptr.assumingMemoryBound(to: spine_slot_pose_wrapper.self), - attachment?._ptr.assumingMemoryBound(to: spine_attachment_wrapper.self)) + public func resolveIndex(_ pose: SlotPose) -> Int32 { + let result = spine_sequence_resolve_index(_ptr.assumingMemoryBound(to: spine_sequence_wrapper.self), pose._ptr.assumingMemoryBound(to: spine_slot_pose_wrapper.self)) + return result + } + + public func getRegion(_ index: Int32) -> TextureRegion? { + let result = spine_sequence_get_region(_ptr.assumingMemoryBound(to: spine_sequence_wrapper.self), index) + return result.map { TextureRegion(fromPointer: $0) } + } + + public func getUVs(_ index: Int32) -> ArrayFloat { + let result = spine_sequence_get_u_vs(_ptr.assumingMemoryBound(to: spine_sequence_wrapper.self), index) + return ArrayFloat(fromPointer: result!) + } + + /// Returns vertex offsets from the center of a RegionAttachment. Invalid to call for a + /// MeshAttachment. + public func getOffsets(_ index: Int32) -> ArrayFloat { + let result = spine_sequence_get_offsets(_ptr.assumingMemoryBound(to: spine_sequence_wrapper.self), index) + return ArrayFloat(fromPointer: result!) } public func getPath(_ basePath: String, _ index: Int32) -> String { @@ -111,7 +129,17 @@ public class Sequence: NSObject { return String(cString: result!) } + /// Computes UVs and offsets for the specified attachment. Must be called if the regions or + /// attachment properties are changed. + public func update(_ attachment: RegionAttachment) { + spine_sequence_update_1(_ptr.assumingMemoryBound(to: spine_sequence_wrapper.self), attachment._ptr.assumingMemoryBound(to: spine_region_attachment_wrapper.self)) + } + + public func update2(_ attachment: MeshAttachment) { + spine_sequence_update_2(_ptr.assumingMemoryBound(to: spine_sequence_wrapper.self), attachment._ptr.assumingMemoryBound(to: spine_mesh_attachment_wrapper.self)) + } + public func dispose() { spine_sequence_dispose(_ptr.assumingMemoryBound(to: spine_sequence_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/Skeleton.swift b/spine-ios/Sources/SpineSwift/Generated/Skeleton.swift index a16b42f86..c957d48d9 100644 --- a/spine-ios/Sources/SpineSwift/Generated/Skeleton.swift +++ b/spine-ios/Sources/SpineSwift/Generated/Skeleton.swift @@ -101,7 +101,7 @@ public class Skeleton: NSObject { public var scaleX: Float { get { let result = spine_skeleton_get_scale_x(_ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) - return result + return result } set { spine_skeleton_set_scale_x(_ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self), newValue) @@ -111,7 +111,7 @@ public class Skeleton: NSObject { public var scaleY: Float { get { let result = spine_skeleton_get_scale_y(_ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) - return result + return result } set { spine_skeleton_set_scale_y(_ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self), newValue) @@ -121,7 +121,7 @@ public class Skeleton: NSObject { public var x: Float { get { let result = spine_skeleton_get_x(_ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) - return result + return result } set { spine_skeleton_set_x(_ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self), newValue) @@ -131,7 +131,7 @@ public class Skeleton: NSObject { public var y: Float { get { let result = spine_skeleton_get_y(_ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) - return result + return result } set { spine_skeleton_set_y(_ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self), newValue) @@ -141,7 +141,7 @@ public class Skeleton: NSObject { public var windX: Float { get { let result = spine_skeleton_get_wind_x(_ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) - return result + return result } set { spine_skeleton_set_wind_x(_ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self), newValue) @@ -151,7 +151,7 @@ public class Skeleton: NSObject { public var windY: Float { get { let result = spine_skeleton_get_wind_y(_ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) - return result + return result } set { spine_skeleton_set_wind_y(_ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self), newValue) @@ -161,7 +161,7 @@ public class Skeleton: NSObject { public var gravityX: Float { get { let result = spine_skeleton_get_gravity_x(_ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) - return result + return result } set { spine_skeleton_set_gravity_x(_ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self), newValue) @@ -171,7 +171,7 @@ public class Skeleton: NSObject { public var gravityY: Float { get { let result = spine_skeleton_get_gravity_y(_ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) - return result + return result } set { spine_skeleton_set_gravity_y(_ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self), newValue) @@ -181,7 +181,7 @@ public class Skeleton: NSObject { public var time: Float { get { let result = spine_skeleton_get_time(_ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) - return result + return result } set { spine_skeleton_set_time(_ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self), newValue) @@ -191,8 +191,7 @@ public class Skeleton: NSObject { public var setColor: Color { get { fatalError("Setter-only property") } set(newValue) { - spine_skeleton_set_color_1( - _ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self), newValue._ptr.assumingMemoryBound(to: spine_color_wrapper.self)) + spine_skeleton_set_color_1(_ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self), newValue._ptr.assumingMemoryBound(to: spine_color_wrapper.self)) } } @@ -207,13 +206,11 @@ public class Skeleton: NSObject { } public func constrained(_ object: Posed) { - spine_skeleton_constrained( - _ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self), object._ptr.assumingMemoryBound(to: spine_posed_wrapper.self)) + spine_skeleton_constrained(_ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self), object._ptr.assumingMemoryBound(to: spine_posed_wrapper.self)) } public func sortBone(_ bone: Bone?) { - spine_skeleton_sort_bone( - _ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self), bone?._ptr.assumingMemoryBound(to: spine_bone_wrapper.self)) + spine_skeleton_sort_bone(_ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self), bone?._ptr.assumingMemoryBound(to: spine_bone_wrapper.self)) } public static func sortReset(_ bones: ArrayBone) { @@ -225,8 +222,7 @@ public class Skeleton: NSObject { /// See [World transforms](http://esotericsoftware.com/spine-runtime-skeletons#World-transforms) /// in the Spine Runtimes Guide. public func updateWorldTransform(_ physics: Physics) { - spine_skeleton_update_world_transform( - _ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self), spine_physics(rawValue: UInt32(physics.rawValue))) + spine_skeleton_update_world_transform(_ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self), spine_physics(rawValue: UInt32(physics.rawValue))) } /// Sets the bones, constraints, and slots to their setup pose values. @@ -297,8 +293,7 @@ public class Skeleton: NSObject { /// /// - Parameter newSkin: May be NULL. public func setSkin2(_ newSkin: Skin?) { - spine_skeleton_set_skin_2( - _ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self), newSkin?._ptr.assumingMemoryBound(to: spine_skin_wrapper.self)) + spine_skeleton_set_skin_2(_ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self), newSkin?._ptr.assumingMemoryBound(to: spine_skin_wrapper.self)) } /// - Returns: May be NULL. @@ -368,4 +363,4 @@ public class Skeleton: NSObject { public func dispose() { spine_skeleton_dispose(_ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/Skin.swift b/spine-ios/Sources/SpineSwift/Generated/Skin.swift index c40f0f594..73cdb8f4f 100644 --- a/spine-ios/Sources/SpineSwift/Generated/Skin.swift +++ b/spine-ios/Sources/SpineSwift/Generated/Skin.swift @@ -73,9 +73,7 @@ public class Skin: NSObject { /// Adds an attachment to the skin for the specified slot index and name. If the name already /// exists for the slot, the previous value is replaced. public func setAttachment(_ slotIndex: Int, _ name: String, _ attachment: Attachment?) { - spine_skin_set_attachment( - _ptr.assumingMemoryBound(to: spine_skin_wrapper.self), slotIndex, name, - attachment?._ptr.assumingMemoryBound(to: spine_attachment_wrapper.self)) + spine_skin_set_attachment(_ptr.assumingMemoryBound(to: spine_skin_wrapper.self), slotIndex, name, attachment?._ptr.assumingMemoryBound(to: spine_attachment_wrapper.self)) } /// Returns the attachment for the specified slot index and name, or NULL. @@ -119,9 +117,7 @@ public class Skin: NSObject { /// - Parameter slotIndex: The target slotIndex. To find the slot index, use SkeletonData::findSlot and SlotData::getIndex. /// - Parameter attachments: Found Attachments will be added to this array. public func findAttachmentsForSlot(_ slotIndex: Int, _ attachments: ArrayAttachment) { - spine_skin_find_attachments_for_slot( - _ptr.assumingMemoryBound(to: spine_skin_wrapper.self), slotIndex, - attachments._ptr.assumingMemoryBound(to: spine_array_attachment_wrapper.self)) + spine_skin_find_attachments_for_slot(_ptr.assumingMemoryBound(to: spine_skin_wrapper.self), slotIndex, attachments._ptr.assumingMemoryBound(to: spine_array_attachment_wrapper.self)) } /// Adds all attachments, bones, and constraints from the specified skin to this skin. @@ -138,4 +134,4 @@ public class Skin: NSObject { public func dispose() { spine_skin_dispose(_ptr.assumingMemoryBound(to: spine_skin_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/Slider.swift b/spine-ios/Sources/SpineSwift/Generated/Slider.swift index 29771d72b..0eda5009c 100644 --- a/spine-ios/Sources/SpineSwift/Generated/Slider.swift +++ b/spine-ios/Sources/SpineSwift/Generated/Slider.swift @@ -42,29 +42,26 @@ public class Slider: SliderBase { } public convenience init(_ data: SliderData, _ skeleton: Skeleton) { - let ptr = spine_slider_create( - data._ptr.assumingMemoryBound(to: spine_slider_data_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) + let ptr = spine_slider_create(data._ptr.assumingMemoryBound(to: spine_slider_data_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) self.init(fromPointer: ptr!) } public var bone: Bone { get { let result = spine_slider_get_bone(_ptr.assumingMemoryBound(to: spine_slider_wrapper.self)) - return Bone(fromPointer: result!) + return Bone(fromPointer: result!) } set { - spine_slider_set_bone( - _ptr.assumingMemoryBound(to: spine_slider_wrapper.self), newValue._ptr.assumingMemoryBound(to: spine_bone_wrapper.self)) + spine_slider_set_bone(_ptr.assumingMemoryBound(to: spine_slider_wrapper.self), newValue._ptr.assumingMemoryBound(to: spine_bone_wrapper.self)) } } public func copyAttachment(_ skeleton: Skeleton) -> Slider { - let result = spine_slider_copy( - _ptr.assumingMemoryBound(to: spine_slider_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) + let result = spine_slider_copy(_ptr.assumingMemoryBound(to: spine_slider_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) return Slider(fromPointer: result!) } public override func dispose() { spine_slider_dispose(_ptr.assumingMemoryBound(to: spine_slider_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/Slot.swift b/spine-ios/Sources/SpineSwift/Generated/Slot.swift index f391f8d1c..9a8bdccad 100644 --- a/spine-ios/Sources/SpineSwift/Generated/Slot.swift +++ b/spine-ios/Sources/SpineSwift/Generated/Slot.swift @@ -46,8 +46,7 @@ public class Slot: NSObject, Posed { } public convenience init(_ data: SlotData, _ skeleton: Skeleton) { - let ptr = spine_slot_create( - data._ptr.assumingMemoryBound(to: spine_slot_data_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) + let ptr = spine_slot_create(data._ptr.assumingMemoryBound(to: spine_slot_data_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) self.init(fromPointer: ptr!) } @@ -93,4 +92,4 @@ public class Slot: NSObject, Posed { public func dispose() { spine_slot_dispose(_ptr.assumingMemoryBound(to: spine_slot_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/Timeline.swift b/spine-ios/Sources/SpineSwift/Generated/Timeline.swift index 28f7ee805..30ef89927 100644 --- a/spine-ios/Sources/SpineSwift/Generated/Timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/Timeline.swift @@ -83,14 +83,8 @@ open class Timeline: NSObject { /// - Parameter blend: Controls how mixing is applied when alpha is than 1. /// - Parameter direction: Indicates whether the timeline is mixing in or out. Used by timelines which perform instant transitions such as DrawOrderTimeline and AttachmentTimeline. /// - Parameter appliedPose: True to modify the applied pose. - public func apply( - _ skeleton: Skeleton, _ lastTime: Float, _ time: Float, _ events: ArrayEvent?, _ alpha: Float, _ blend: MixBlend, _ direction: MixDirection, - _ appliedPose: Bool - ) { - spine_timeline_apply( - _ptr.assumingMemoryBound(to: spine_timeline_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self), lastTime, - time, events?._ptr.assumingMemoryBound(to: spine_array_event_wrapper.self), alpha, spine_mix_blend(rawValue: UInt32(blend.rawValue)), - spine_mix_direction(rawValue: UInt32(direction.rawValue)), appliedPose) + public func apply(_ skeleton: Skeleton, _ lastTime: Float, _ time: Float, _ events: ArrayEvent?, _ alpha: Float, _ blend: MixBlend, _ direction: MixDirection, _ appliedPose: Bool) { + spine_timeline_apply(_ptr.assumingMemoryBound(to: spine_timeline_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self), lastTime, time, events?._ptr.assumingMemoryBound(to: spine_array_event_wrapper.self), alpha, spine_mix_blend(rawValue: UInt32(blend.rawValue)), spine_mix_direction(rawValue: UInt32(direction.rawValue)), appliedPose) } public static func rttiStatic() -> Rtti { @@ -98,4 +92,4 @@ open class Timeline: NSObject { return Rtti(fromPointer: result!) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/Update.swift b/spine-ios/Sources/SpineSwift/Generated/Update.swift index f5f3afe52..d5de4ec83 100644 --- a/spine-ios/Sources/SpineSwift/Generated/Update.swift +++ b/spine-ios/Sources/SpineSwift/Generated/Update.swift @@ -38,4 +38,4 @@ public protocol Update { var rtti: Rtti { get } func update(_ skeleton: Skeleton, _ physics: Physics) static func rttiStatic() -> Rtti -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/alpha_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/alpha_timeline.swift index 1c5175283..1376320e1 100644 --- a/spine-ios/Sources/SpineSwift/Generated/alpha_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/alpha_timeline.swift @@ -49,7 +49,7 @@ public class AlphaTimeline: CurveTimeline1, SlotTimeline { public var slotIndex: Int32 { get { let result = spine_alpha_timeline_get_slot_index(_ptr.assumingMemoryBound(to: spine_alpha_timeline_wrapper.self)) - return result + return result } set { spine_alpha_timeline_set_slot_index(_ptr.assumingMemoryBound(to: spine_alpha_timeline_wrapper.self), newValue) @@ -59,4 +59,4 @@ public class AlphaTimeline: CurveTimeline1, SlotTimeline { public func dispose() { spine_alpha_timeline_dispose(_ptr.assumingMemoryBound(to: spine_alpha_timeline_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/animation_state.swift b/spine-ios/Sources/SpineSwift/Generated/animation_state.swift index 8f4503efd..9fb29ecae 100644 --- a/spine-ios/Sources/SpineSwift/Generated/animation_state.swift +++ b/spine-ios/Sources/SpineSwift/Generated/animation_state.swift @@ -79,7 +79,7 @@ public class AnimationState: NSObject { public var timeScale: Float { get { let result = spine_animation_state_get_time_scale(_ptr.assumingMemoryBound(to: spine_animation_state_wrapper.self)) - return result + return result } set { spine_animation_state_set_time_scale(_ptr.assumingMemoryBound(to: spine_animation_state_wrapper.self), newValue) @@ -89,7 +89,7 @@ public class AnimationState: NSObject { public var manualTrackEntryDisposal: Bool { get { let result = spine_animation_state_get_manual_track_entry_disposal(_ptr.assumingMemoryBound(to: spine_animation_state_wrapper.self)) - return result + return result } set { spine_animation_state_set_manual_track_entry_disposal(_ptr.assumingMemoryBound(to: spine_animation_state_wrapper.self), newValue) @@ -112,8 +112,7 @@ public class AnimationState: NSObject { /// /// - Returns: True if any animations were applied. public func apply(_ skeleton: Skeleton) -> Bool { - let result = spine_animation_state_apply( - _ptr.assumingMemoryBound(to: spine_animation_state_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) + let result = spine_animation_state_apply(_ptr.assumingMemoryBound(to: spine_animation_state_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) return result } @@ -143,7 +142,7 @@ public class AnimationState: NSObject { /// less over the mix duration. Properties keyed in the previous animation transition to the /// value from lower tracks or to the setup pose value if no lower tracks key the property. A /// mix duration of 0 still mixes out over one frame. - /// +/// /// Mixing in is done by first setting an empty animation, then adding an animation using /// addAnimation(int, Animation, bool, float) with the desired delay (an empty animation has a /// duration of 0) and on the returned track entry, set the TrackEntry::setMixDuration(float). @@ -151,11 +150,10 @@ public class AnimationState: NSObject { /// mix duration. Properties keyed in the new animation transition from the value from lower /// tracks or from the setup pose value if no lower tracks key the property to the value keyed /// in the new animation. - /// +/// /// See Empty animations in the Spine Runtimes Guide. public func setEmptyAnimation(_ trackIndex: Int, _ mixDuration: Float) -> TrackEntry { - let result = spine_animation_state_set_empty_animation( - _ptr.assumingMemoryBound(to: spine_animation_state_wrapper.self), trackIndex, mixDuration) + let result = spine_animation_state_set_empty_animation(_ptr.assumingMemoryBound(to: spine_animation_state_wrapper.self), trackIndex, mixDuration) return TrackEntry(fromPointer: result!) } @@ -169,8 +167,7 @@ public class AnimationState: NSObject { /// /// - Returns: A track entry to allow further customization of animation playback. References to the track entry must not be kept after the AnimationStateListener::dispose(TrackEntry) event occurs. public func addEmptyAnimation(_ trackIndex: Int, _ mixDuration: Float, _ delay: Float) -> TrackEntry { - let result = spine_animation_state_add_empty_animation( - _ptr.assumingMemoryBound(to: spine_animation_state_wrapper.self), trackIndex, mixDuration, delay) + let result = spine_animation_state_add_empty_animation(_ptr.assumingMemoryBound(to: spine_animation_state_wrapper.self), trackIndex, mixDuration, delay) return TrackEntry(fromPointer: result!) } @@ -189,16 +186,14 @@ public class AnimationState: NSObject { } public func disposeTrackEntry(_ entry: TrackEntry?) { - spine_animation_state_dispose_track_entry( - _ptr.assumingMemoryBound(to: spine_animation_state_wrapper.self), entry?._ptr.assumingMemoryBound(to: spine_track_entry_wrapper.self)) + spine_animation_state_dispose_track_entry(_ptr.assumingMemoryBound(to: spine_animation_state_wrapper.self), entry?._ptr.assumingMemoryBound(to: spine_track_entry_wrapper.self)) } /// Sets an animation by name. /// /// See setAnimation(int, Animation, bool). public func setAnimation(_ trackIndex: Int, _ animationName: String, _ loop: Bool) -> TrackEntry { - let result = spine_animation_state_set_animation_1( - _ptr.assumingMemoryBound(to: spine_animation_state_wrapper.self), trackIndex, animationName, loop) + let result = spine_animation_state_set_animation_1(_ptr.assumingMemoryBound(to: spine_animation_state_wrapper.self), trackIndex, animationName, loop) return TrackEntry(fromPointer: result!) } @@ -211,9 +206,7 @@ public class AnimationState: NSObject { /// /// - Returns: A track entry to allow further customization of animation playback. References to the track entry must not be kept after AnimationState.Dispose. public func setAnimation2(_ trackIndex: Int, _ animation: Animation, _ loop: Bool) -> TrackEntry { - let result = spine_animation_state_set_animation_2( - _ptr.assumingMemoryBound(to: spine_animation_state_wrapper.self), trackIndex, - animation._ptr.assumingMemoryBound(to: spine_animation_wrapper.self), loop) + let result = spine_animation_state_set_animation_2(_ptr.assumingMemoryBound(to: spine_animation_state_wrapper.self), trackIndex, animation._ptr.assumingMemoryBound(to: spine_animation_wrapper.self), loop) return TrackEntry(fromPointer: result!) } @@ -221,8 +214,7 @@ public class AnimationState: NSObject { /// /// See addAnimation(int, Animation, bool, float). public func addAnimation(_ trackIndex: Int, _ animationName: String, _ loop: Bool, _ delay: Float) -> TrackEntry { - let result = spine_animation_state_add_animation_1( - _ptr.assumingMemoryBound(to: spine_animation_state_wrapper.self), trackIndex, animationName, loop, delay) + let result = spine_animation_state_add_animation_1(_ptr.assumingMemoryBound(to: spine_animation_state_wrapper.self), trackIndex, animationName, loop, delay) return TrackEntry(fromPointer: result!) } @@ -233,13 +225,11 @@ public class AnimationState: NSObject { /// /// - Returns: A track entry to allow further customization of animation playback. References to the track entry must not be kept after AnimationState.Dispose public func addAnimation2(_ trackIndex: Int, _ animation: Animation, _ loop: Bool, _ delay: Float) -> TrackEntry { - let result = spine_animation_state_add_animation_2( - _ptr.assumingMemoryBound(to: spine_animation_state_wrapper.self), trackIndex, - animation._ptr.assumingMemoryBound(to: spine_animation_wrapper.self), loop, delay) + let result = spine_animation_state_add_animation_2(_ptr.assumingMemoryBound(to: spine_animation_state_wrapper.self), trackIndex, animation._ptr.assumingMemoryBound(to: spine_animation_wrapper.self), loop, delay) return TrackEntry(fromPointer: result!) } public func dispose() { spine_animation_state_dispose(_ptr.assumingMemoryBound(to: spine_animation_state_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/animation_state_data.swift b/spine-ios/Sources/SpineSwift/Generated/animation_state_data.swift index 103d98e82..ce3ebacc3 100644 --- a/spine-ios/Sources/SpineSwift/Generated/animation_state_data.swift +++ b/spine-ios/Sources/SpineSwift/Generated/animation_state_data.swift @@ -59,7 +59,7 @@ public class AnimationStateData: NSObject { public var defaultMix: Float { get { let result = spine_animation_state_data_get_default_mix(_ptr.assumingMemoryBound(to: spine_animation_state_data_wrapper.self)) - return result + return result } set { spine_animation_state_data_set_default_mix(_ptr.assumingMemoryBound(to: spine_animation_state_data_wrapper.self), newValue) @@ -69,9 +69,7 @@ public class AnimationStateData: NSObject { /// The mix duration to use when changing from the specified animation to the other, or the /// DefaultMix if no mix duration has been set. public func getMix(_ from: Animation, _ to: Animation) -> Float { - let result = spine_animation_state_data_get_mix( - _ptr.assumingMemoryBound(to: spine_animation_state_data_wrapper.self), from._ptr.assumingMemoryBound(to: spine_animation_wrapper.self), - to._ptr.assumingMemoryBound(to: spine_animation_wrapper.self)) + let result = spine_animation_state_data_get_mix(_ptr.assumingMemoryBound(to: spine_animation_state_data_wrapper.self), from._ptr.assumingMemoryBound(to: spine_animation_wrapper.self), to._ptr.assumingMemoryBound(to: spine_animation_wrapper.self)) return result } @@ -88,12 +86,10 @@ public class AnimationStateData: NSObject { /// Sets a mix duration when changing from the specified animation to the other. See /// TrackEntry.MixDuration. public func setMix2(_ from: Animation, _ to: Animation, _ duration: Float) { - spine_animation_state_data_set_mix_2( - _ptr.assumingMemoryBound(to: spine_animation_state_data_wrapper.self), from._ptr.assumingMemoryBound(to: spine_animation_wrapper.self), - to._ptr.assumingMemoryBound(to: spine_animation_wrapper.self), duration) + spine_animation_state_data_set_mix_2(_ptr.assumingMemoryBound(to: spine_animation_state_data_wrapper.self), from._ptr.assumingMemoryBound(to: spine_animation_wrapper.self), to._ptr.assumingMemoryBound(to: spine_animation_wrapper.self), duration) } public func dispose() { spine_animation_state_data_dispose(_ptr.assumingMemoryBound(to: spine_animation_state_data_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/atlas_attachment_loader.swift b/spine-ios/Sources/SpineSwift/Generated/atlas_attachment_loader.swift index 60dac3837..fe2639a1b 100644 --- a/spine-ios/Sources/SpineSwift/Generated/atlas_attachment_loader.swift +++ b/spine-ios/Sources/SpineSwift/Generated/atlas_attachment_loader.swift @@ -52,44 +52,32 @@ public class AtlasAttachmentLoader: NSObject, AttachmentLoader { } public func newRegionAttachment(_ skin: Skin, _ name: String, _ path: String, _ sequence: Sequence?) -> RegionAttachment? { - let result = spine_atlas_attachment_loader_new_region_attachment( - _ptr.assumingMemoryBound(to: spine_atlas_attachment_loader_wrapper.self), skin._ptr.assumingMemoryBound(to: spine_skin_wrapper.self), - name, path, sequence?._ptr.assumingMemoryBound(to: spine_sequence_wrapper.self)) + let result = spine_atlas_attachment_loader_new_region_attachment(_ptr.assumingMemoryBound(to: spine_atlas_attachment_loader_wrapper.self), skin._ptr.assumingMemoryBound(to: spine_skin_wrapper.self), name, path, sequence?._ptr.assumingMemoryBound(to: spine_sequence_wrapper.self)) return result.map { RegionAttachment(fromPointer: $0) } } public func newMeshAttachment(_ skin: Skin, _ name: String, _ path: String, _ sequence: Sequence?) -> MeshAttachment? { - let result = spine_atlas_attachment_loader_new_mesh_attachment( - _ptr.assumingMemoryBound(to: spine_atlas_attachment_loader_wrapper.self), skin._ptr.assumingMemoryBound(to: spine_skin_wrapper.self), - name, path, sequence?._ptr.assumingMemoryBound(to: spine_sequence_wrapper.self)) + let result = spine_atlas_attachment_loader_new_mesh_attachment(_ptr.assumingMemoryBound(to: spine_atlas_attachment_loader_wrapper.self), skin._ptr.assumingMemoryBound(to: spine_skin_wrapper.self), name, path, sequence?._ptr.assumingMemoryBound(to: spine_sequence_wrapper.self)) return result.map { MeshAttachment(fromPointer: $0) } } public func newBoundingBoxAttachment(_ skin: Skin, _ name: String) -> BoundingBoxAttachment? { - let result = spine_atlas_attachment_loader_new_bounding_box_attachment( - _ptr.assumingMemoryBound(to: spine_atlas_attachment_loader_wrapper.self), skin._ptr.assumingMemoryBound(to: spine_skin_wrapper.self), name - ) + let result = spine_atlas_attachment_loader_new_bounding_box_attachment(_ptr.assumingMemoryBound(to: spine_atlas_attachment_loader_wrapper.self), skin._ptr.assumingMemoryBound(to: spine_skin_wrapper.self), name) return result.map { BoundingBoxAttachment(fromPointer: $0) } } public func newPathAttachment(_ skin: Skin, _ name: String) -> PathAttachment? { - let result = spine_atlas_attachment_loader_new_path_attachment( - _ptr.assumingMemoryBound(to: spine_atlas_attachment_loader_wrapper.self), skin._ptr.assumingMemoryBound(to: spine_skin_wrapper.self), name - ) + let result = spine_atlas_attachment_loader_new_path_attachment(_ptr.assumingMemoryBound(to: spine_atlas_attachment_loader_wrapper.self), skin._ptr.assumingMemoryBound(to: spine_skin_wrapper.self), name) return result.map { PathAttachment(fromPointer: $0) } } public func newPointAttachment(_ skin: Skin, _ name: String) -> PointAttachment? { - let result = spine_atlas_attachment_loader_new_point_attachment( - _ptr.assumingMemoryBound(to: spine_atlas_attachment_loader_wrapper.self), skin._ptr.assumingMemoryBound(to: spine_skin_wrapper.self), name - ) + let result = spine_atlas_attachment_loader_new_point_attachment(_ptr.assumingMemoryBound(to: spine_atlas_attachment_loader_wrapper.self), skin._ptr.assumingMemoryBound(to: spine_skin_wrapper.self), name) return result.map { PointAttachment(fromPointer: $0) } } public func newClippingAttachment(_ skin: Skin, _ name: String) -> ClippingAttachment? { - let result = spine_atlas_attachment_loader_new_clipping_attachment( - _ptr.assumingMemoryBound(to: spine_atlas_attachment_loader_wrapper.self), skin._ptr.assumingMemoryBound(to: spine_skin_wrapper.self), name - ) + let result = spine_atlas_attachment_loader_new_clipping_attachment(_ptr.assumingMemoryBound(to: spine_atlas_attachment_loader_wrapper.self), skin._ptr.assumingMemoryBound(to: spine_skin_wrapper.self), name) return result.map { ClippingAttachment(fromPointer: $0) } } @@ -101,4 +89,4 @@ public class AtlasAttachmentLoader: NSObject, AttachmentLoader { public func dispose() { spine_atlas_attachment_loader_dispose(_ptr.assumingMemoryBound(to: spine_atlas_attachment_loader_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/atlas_page.swift b/spine-ios/Sources/SpineSwift/Generated/atlas_page.swift index 0febb12d7..13c08f974 100644 --- a/spine-ios/Sources/SpineSwift/Generated/atlas_page.swift +++ b/spine-ios/Sources/SpineSwift/Generated/atlas_page.swift @@ -51,7 +51,7 @@ public class AtlasPage: NSObject { public var name: String { get { let result = spine_atlas_page_get_name(_ptr.assumingMemoryBound(to: spine_atlas_page_wrapper.self)) - return String(cString: result!) + return String(cString: result!) } set { spine_atlas_page_set_name(_ptr.assumingMemoryBound(to: spine_atlas_page_wrapper.self), newValue) @@ -61,7 +61,7 @@ public class AtlasPage: NSObject { public var texturePath: String { get { let result = spine_atlas_page_get_texture_path(_ptr.assumingMemoryBound(to: spine_atlas_page_wrapper.self)) - return String(cString: result!) + return String(cString: result!) } set { spine_atlas_page_set_texture_path(_ptr.assumingMemoryBound(to: spine_atlas_page_wrapper.self), newValue) @@ -71,62 +71,57 @@ public class AtlasPage: NSObject { public var format: Format { get { let result = spine_atlas_page_get_format(_ptr.assumingMemoryBound(to: spine_atlas_page_wrapper.self)) - return Format(rawValue: Int32(result.rawValue))! + return Format(rawValue: Int32(result.rawValue))! } set { - spine_atlas_page_set_format( - _ptr.assumingMemoryBound(to: spine_atlas_page_wrapper.self), spine_format(rawValue: UInt32(newValue.rawValue))) + spine_atlas_page_set_format(_ptr.assumingMemoryBound(to: spine_atlas_page_wrapper.self), spine_format(rawValue: UInt32(newValue.rawValue))) } } public var minFilter: TextureFilter { get { let result = spine_atlas_page_get_min_filter(_ptr.assumingMemoryBound(to: spine_atlas_page_wrapper.self)) - return TextureFilter(rawValue: Int32(result.rawValue))! + return TextureFilter(rawValue: Int32(result.rawValue))! } set { - spine_atlas_page_set_min_filter( - _ptr.assumingMemoryBound(to: spine_atlas_page_wrapper.self), spine_texture_filter(rawValue: UInt32(newValue.rawValue))) + spine_atlas_page_set_min_filter(_ptr.assumingMemoryBound(to: spine_atlas_page_wrapper.self), spine_texture_filter(rawValue: UInt32(newValue.rawValue))) } } public var magFilter: TextureFilter { get { let result = spine_atlas_page_get_mag_filter(_ptr.assumingMemoryBound(to: spine_atlas_page_wrapper.self)) - return TextureFilter(rawValue: Int32(result.rawValue))! + return TextureFilter(rawValue: Int32(result.rawValue))! } set { - spine_atlas_page_set_mag_filter( - _ptr.assumingMemoryBound(to: spine_atlas_page_wrapper.self), spine_texture_filter(rawValue: UInt32(newValue.rawValue))) + spine_atlas_page_set_mag_filter(_ptr.assumingMemoryBound(to: spine_atlas_page_wrapper.self), spine_texture_filter(rawValue: UInt32(newValue.rawValue))) } } public var uWrap: TextureWrap { get { let result = spine_atlas_page_get_u_wrap(_ptr.assumingMemoryBound(to: spine_atlas_page_wrapper.self)) - return TextureWrap(rawValue: Int32(result.rawValue))! + return TextureWrap(rawValue: Int32(result.rawValue))! } set { - spine_atlas_page_set_u_wrap( - _ptr.assumingMemoryBound(to: spine_atlas_page_wrapper.self), spine_texture_wrap(rawValue: UInt32(newValue.rawValue))) + spine_atlas_page_set_u_wrap(_ptr.assumingMemoryBound(to: spine_atlas_page_wrapper.self), spine_texture_wrap(rawValue: UInt32(newValue.rawValue))) } } public var vWrap: TextureWrap { get { let result = spine_atlas_page_get_v_wrap(_ptr.assumingMemoryBound(to: spine_atlas_page_wrapper.self)) - return TextureWrap(rawValue: Int32(result.rawValue))! + return TextureWrap(rawValue: Int32(result.rawValue))! } set { - spine_atlas_page_set_v_wrap( - _ptr.assumingMemoryBound(to: spine_atlas_page_wrapper.self), spine_texture_wrap(rawValue: UInt32(newValue.rawValue))) + spine_atlas_page_set_v_wrap(_ptr.assumingMemoryBound(to: spine_atlas_page_wrapper.self), spine_texture_wrap(rawValue: UInt32(newValue.rawValue))) } } public var width: Int32 { get { let result = spine_atlas_page_get_width(_ptr.assumingMemoryBound(to: spine_atlas_page_wrapper.self)) - return result + return result } set { spine_atlas_page_set_width(_ptr.assumingMemoryBound(to: spine_atlas_page_wrapper.self), newValue) @@ -136,7 +131,7 @@ public class AtlasPage: NSObject { public var height: Int32 { get { let result = spine_atlas_page_get_height(_ptr.assumingMemoryBound(to: spine_atlas_page_wrapper.self)) - return result + return result } set { spine_atlas_page_set_height(_ptr.assumingMemoryBound(to: spine_atlas_page_wrapper.self), newValue) @@ -146,7 +141,7 @@ public class AtlasPage: NSObject { public var pma: Bool { get { let result = spine_atlas_page_get_pma(_ptr.assumingMemoryBound(to: spine_atlas_page_wrapper.self)) - return result + return result } set { spine_atlas_page_set_pma(_ptr.assumingMemoryBound(to: spine_atlas_page_wrapper.self), newValue) @@ -156,7 +151,7 @@ public class AtlasPage: NSObject { public var index: Int32 { get { let result = spine_atlas_page_get_index(_ptr.assumingMemoryBound(to: spine_atlas_page_wrapper.self)) - return result + return result } set { spine_atlas_page_set_index(_ptr.assumingMemoryBound(to: spine_atlas_page_wrapper.self), newValue) @@ -171,4 +166,4 @@ public class AtlasPage: NSObject { public func dispose() { spine_atlas_page_dispose(_ptr.assumingMemoryBound(to: spine_atlas_page_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/atlas_region.swift b/spine-ios/Sources/SpineSwift/Generated/atlas_region.swift index 9604cc1d8..863114753 100644 --- a/spine-ios/Sources/SpineSwift/Generated/atlas_region.swift +++ b/spine-ios/Sources/SpineSwift/Generated/atlas_region.swift @@ -49,18 +49,17 @@ public class AtlasRegion: TextureRegion { public var page: AtlasPage? { get { let result = spine_atlas_region_get_page(_ptr.assumingMemoryBound(to: spine_atlas_region_wrapper.self)) - return result.map { AtlasPage(fromPointer: $0) } + return result.map { AtlasPage(fromPointer: $0) } } set { - spine_atlas_region_set_page( - _ptr.assumingMemoryBound(to: spine_atlas_region_wrapper.self), newValue?._ptr.assumingMemoryBound(to: spine_atlas_page_wrapper.self)) + spine_atlas_region_set_page(_ptr.assumingMemoryBound(to: spine_atlas_region_wrapper.self), newValue?._ptr.assumingMemoryBound(to: spine_atlas_page_wrapper.self)) } } public var name: String { get { let result = spine_atlas_region_get_name(_ptr.assumingMemoryBound(to: spine_atlas_region_wrapper.self)) - return String(cString: result!) + return String(cString: result!) } set { spine_atlas_region_set_name(_ptr.assumingMemoryBound(to: spine_atlas_region_wrapper.self), newValue) @@ -70,7 +69,7 @@ public class AtlasRegion: TextureRegion { public var index: Int32 { get { let result = spine_atlas_region_get_index(_ptr.assumingMemoryBound(to: spine_atlas_region_wrapper.self)) - return result + return result } set { spine_atlas_region_set_index(_ptr.assumingMemoryBound(to: spine_atlas_region_wrapper.self), newValue) @@ -80,7 +79,7 @@ public class AtlasRegion: TextureRegion { public var x: Int32 { get { let result = spine_atlas_region_get_x(_ptr.assumingMemoryBound(to: spine_atlas_region_wrapper.self)) - return result + return result } set { spine_atlas_region_set_x(_ptr.assumingMemoryBound(to: spine_atlas_region_wrapper.self), newValue) @@ -90,7 +89,7 @@ public class AtlasRegion: TextureRegion { public var y: Int32 { get { let result = spine_atlas_region_get_y(_ptr.assumingMemoryBound(to: spine_atlas_region_wrapper.self)) - return result + return result } set { spine_atlas_region_set_y(_ptr.assumingMemoryBound(to: spine_atlas_region_wrapper.self), newValue) @@ -100,7 +99,7 @@ public class AtlasRegion: TextureRegion { public var offsetX: Float { get { let result = spine_atlas_region_get_offset_x(_ptr.assumingMemoryBound(to: spine_atlas_region_wrapper.self)) - return result + return result } set { spine_atlas_region_set_offset_x(_ptr.assumingMemoryBound(to: spine_atlas_region_wrapper.self), newValue) @@ -110,7 +109,7 @@ public class AtlasRegion: TextureRegion { public var offsetY: Float { get { let result = spine_atlas_region_get_offset_y(_ptr.assumingMemoryBound(to: spine_atlas_region_wrapper.self)) - return result + return result } set { spine_atlas_region_set_offset_y(_ptr.assumingMemoryBound(to: spine_atlas_region_wrapper.self), newValue) @@ -120,7 +119,7 @@ public class AtlasRegion: TextureRegion { public var packedWidth: Int32 { get { let result = spine_atlas_region_get_packed_width(_ptr.assumingMemoryBound(to: spine_atlas_region_wrapper.self)) - return result + return result } set { spine_atlas_region_set_packed_width(_ptr.assumingMemoryBound(to: spine_atlas_region_wrapper.self), newValue) @@ -130,7 +129,7 @@ public class AtlasRegion: TextureRegion { public var packedHeight: Int32 { get { let result = spine_atlas_region_get_packed_height(_ptr.assumingMemoryBound(to: spine_atlas_region_wrapper.self)) - return result + return result } set { spine_atlas_region_set_packed_height(_ptr.assumingMemoryBound(to: spine_atlas_region_wrapper.self), newValue) @@ -140,7 +139,7 @@ public class AtlasRegion: TextureRegion { public var originalWidth: Int32 { get { let result = spine_atlas_region_get_original_width(_ptr.assumingMemoryBound(to: spine_atlas_region_wrapper.self)) - return result + return result } set { spine_atlas_region_set_original_width(_ptr.assumingMemoryBound(to: spine_atlas_region_wrapper.self), newValue) @@ -150,7 +149,7 @@ public class AtlasRegion: TextureRegion { public var originalHeight: Int32 { get { let result = spine_atlas_region_get_original_height(_ptr.assumingMemoryBound(to: spine_atlas_region_wrapper.self)) - return result + return result } set { spine_atlas_region_set_original_height(_ptr.assumingMemoryBound(to: spine_atlas_region_wrapper.self), newValue) @@ -160,7 +159,7 @@ public class AtlasRegion: TextureRegion { public var rotate: Bool { get { let result = spine_atlas_region_get_rotate(_ptr.assumingMemoryBound(to: spine_atlas_region_wrapper.self)) - return result + return result } set { spine_atlas_region_set_rotate(_ptr.assumingMemoryBound(to: spine_atlas_region_wrapper.self), newValue) @@ -170,7 +169,7 @@ public class AtlasRegion: TextureRegion { public var degrees: Int32 { get { let result = spine_atlas_region_get_degrees(_ptr.assumingMemoryBound(to: spine_atlas_region_wrapper.self)) - return result + return result } set { spine_atlas_region_set_degrees(_ptr.assumingMemoryBound(to: spine_atlas_region_wrapper.self), newValue) @@ -180,37 +179,34 @@ public class AtlasRegion: TextureRegion { public var splits: ArrayInt { get { let result = spine_atlas_region_get_splits(_ptr.assumingMemoryBound(to: spine_atlas_region_wrapper.self)) - return ArrayInt(fromPointer: result!) + return ArrayInt(fromPointer: result!) } set { - spine_atlas_region_set_splits( - _ptr.assumingMemoryBound(to: spine_atlas_region_wrapper.self), newValue._ptr.assumingMemoryBound(to: spine_array_int_wrapper.self)) + spine_atlas_region_set_splits(_ptr.assumingMemoryBound(to: spine_atlas_region_wrapper.self), newValue._ptr.assumingMemoryBound(to: spine_array_int_wrapper.self)) } } public var pads: ArrayInt { get { let result = spine_atlas_region_get_pads(_ptr.assumingMemoryBound(to: spine_atlas_region_wrapper.self)) - return ArrayInt(fromPointer: result!) + return ArrayInt(fromPointer: result!) } set { - spine_atlas_region_set_pads( - _ptr.assumingMemoryBound(to: spine_atlas_region_wrapper.self), newValue._ptr.assumingMemoryBound(to: spine_array_int_wrapper.self)) + spine_atlas_region_set_pads(_ptr.assumingMemoryBound(to: spine_atlas_region_wrapper.self), newValue._ptr.assumingMemoryBound(to: spine_array_int_wrapper.self)) } } public var values: ArrayFloat { get { let result = spine_atlas_region_get_values(_ptr.assumingMemoryBound(to: spine_atlas_region_wrapper.self)) - return ArrayFloat(fromPointer: result!) + return ArrayFloat(fromPointer: result!) } set { - spine_atlas_region_set_values( - _ptr.assumingMemoryBound(to: spine_atlas_region_wrapper.self), newValue._ptr.assumingMemoryBound(to: spine_array_float_wrapper.self)) + spine_atlas_region_set_values(_ptr.assumingMemoryBound(to: spine_atlas_region_wrapper.self), newValue._ptr.assumingMemoryBound(to: spine_array_float_wrapper.self)) } } public override func dispose() { spine_atlas_region_dispose(_ptr.assumingMemoryBound(to: spine_atlas_region_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/attachment_loader.swift b/spine-ios/Sources/SpineSwift/Generated/attachment_loader.swift index 14c7c1fb7..eccd9ffa6 100644 --- a/spine-ios/Sources/SpineSwift/Generated/attachment_loader.swift +++ b/spine-ios/Sources/SpineSwift/Generated/attachment_loader.swift @@ -41,4 +41,4 @@ public protocol AttachmentLoader { func newPathAttachment(_ skin: Skin, _ name: String) -> PathAttachment? func newPointAttachment(_ skin: Skin, _ name: String) -> PointAttachment? func newClippingAttachment(_ skin: Skin, _ name: String) -> ClippingAttachment? -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/attachment_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/attachment_timeline.swift index d0de82d98..82a0b21ea 100644 --- a/spine-ios/Sources/SpineSwift/Generated/attachment_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/attachment_timeline.swift @@ -49,7 +49,7 @@ public class AttachmentTimeline: Timeline, SlotTimeline { public var slotIndex: Int32 { get { let result = spine_attachment_timeline_get_slot_index(_ptr.assumingMemoryBound(to: spine_attachment_timeline_wrapper.self)) - return result + return result } set { spine_attachment_timeline_set_slot_index(_ptr.assumingMemoryBound(to: spine_attachment_timeline_wrapper.self), newValue) @@ -67,4 +67,4 @@ public class AttachmentTimeline: Timeline, SlotTimeline { public func dispose() { spine_attachment_timeline_dispose(_ptr.assumingMemoryBound(to: spine_attachment_timeline_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/attachment_type.swift b/spine-ios/Sources/SpineSwift/Generated/attachment_type.swift index 41e8e5409..c3ee65cf3 100644 --- a/spine-ios/Sources/SpineSwift/Generated/attachment_type.swift +++ b/spine-ios/Sources/SpineSwift/Generated/attachment_type.swift @@ -44,4 +44,4 @@ public enum AttachmentType: Int32, CaseIterable { public static func fromValue(_ value: Int32) -> AttachmentType? { return AttachmentType(rawValue: value) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/blend_mode.swift b/spine-ios/Sources/SpineSwift/Generated/blend_mode.swift index d1f8a47ea..188c2c8ff 100644 --- a/spine-ios/Sources/SpineSwift/Generated/blend_mode.swift +++ b/spine-ios/Sources/SpineSwift/Generated/blend_mode.swift @@ -41,4 +41,4 @@ public enum BlendMode: Int32, CaseIterable { public static func fromValue(_ value: Int32) -> BlendMode? { return BlendMode(rawValue: value) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/bone_data.swift b/spine-ios/Sources/SpineSwift/Generated/bone_data.swift index c39957bda..17f66710f 100644 --- a/spine-ios/Sources/SpineSwift/Generated/bone_data.swift +++ b/spine-ios/Sources/SpineSwift/Generated/bone_data.swift @@ -61,7 +61,7 @@ public class BoneData: PosedData { public var length: Float { get { let result = spine_bone_data_get_length(_ptr.assumingMemoryBound(to: spine_bone_data_wrapper.self)) - return result + return result } set { spine_bone_data_set_length(_ptr.assumingMemoryBound(to: spine_bone_data_wrapper.self), newValue) @@ -76,7 +76,7 @@ public class BoneData: PosedData { public var icon: String { get { let result = spine_bone_data_get_icon(_ptr.assumingMemoryBound(to: spine_bone_data_wrapper.self)) - return String(cString: result!) + return String(cString: result!) } set { spine_bone_data_set_icon(_ptr.assumingMemoryBound(to: spine_bone_data_wrapper.self), newValue) @@ -86,7 +86,7 @@ public class BoneData: PosedData { public var visible: Bool { get { let result = spine_bone_data_get_visible(_ptr.assumingMemoryBound(to: spine_bone_data_wrapper.self)) - return result + return result } set { spine_bone_data_set_visible(_ptr.assumingMemoryBound(to: spine_bone_data_wrapper.self), newValue) @@ -101,4 +101,4 @@ public class BoneData: PosedData { public override func dispose() { spine_bone_data_dispose(_ptr.assumingMemoryBound(to: spine_bone_data_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/bone_local.swift b/spine-ios/Sources/SpineSwift/Generated/bone_local.swift index 7cba119da..08c7b70e0 100644 --- a/spine-ios/Sources/SpineSwift/Generated/bone_local.swift +++ b/spine-ios/Sources/SpineSwift/Generated/bone_local.swift @@ -52,7 +52,7 @@ public class BoneLocal: NSObject { public var x: Float { get { let result = spine_bone_local_get_x(_ptr.assumingMemoryBound(to: spine_bone_local_wrapper.self)) - return result + return result } set { spine_bone_local_set_x(_ptr.assumingMemoryBound(to: spine_bone_local_wrapper.self), newValue) @@ -63,7 +63,7 @@ public class BoneLocal: NSObject { public var y: Float { get { let result = spine_bone_local_get_y(_ptr.assumingMemoryBound(to: spine_bone_local_wrapper.self)) - return result + return result } set { spine_bone_local_set_y(_ptr.assumingMemoryBound(to: spine_bone_local_wrapper.self), newValue) @@ -74,7 +74,7 @@ public class BoneLocal: NSObject { public var rotation: Float { get { let result = spine_bone_local_get_rotation(_ptr.assumingMemoryBound(to: spine_bone_local_wrapper.self)) - return result + return result } set { spine_bone_local_set_rotation(_ptr.assumingMemoryBound(to: spine_bone_local_wrapper.self), newValue) @@ -85,7 +85,7 @@ public class BoneLocal: NSObject { public var scaleX: Float { get { let result = spine_bone_local_get_scale_x(_ptr.assumingMemoryBound(to: spine_bone_local_wrapper.self)) - return result + return result } set { spine_bone_local_set_scale_x(_ptr.assumingMemoryBound(to: spine_bone_local_wrapper.self), newValue) @@ -96,7 +96,7 @@ public class BoneLocal: NSObject { public var scaleY: Float { get { let result = spine_bone_local_get_scale_y(_ptr.assumingMemoryBound(to: spine_bone_local_wrapper.self)) - return result + return result } set { spine_bone_local_set_scale_y(_ptr.assumingMemoryBound(to: spine_bone_local_wrapper.self), newValue) @@ -107,7 +107,7 @@ public class BoneLocal: NSObject { public var shearX: Float { get { let result = spine_bone_local_get_shear_x(_ptr.assumingMemoryBound(to: spine_bone_local_wrapper.self)) - return result + return result } set { spine_bone_local_set_shear_x(_ptr.assumingMemoryBound(to: spine_bone_local_wrapper.self), newValue) @@ -118,7 +118,7 @@ public class BoneLocal: NSObject { public var shearY: Float { get { let result = spine_bone_local_get_shear_y(_ptr.assumingMemoryBound(to: spine_bone_local_wrapper.self)) - return result + return result } set { spine_bone_local_set_shear_y(_ptr.assumingMemoryBound(to: spine_bone_local_wrapper.self), newValue) @@ -129,11 +129,10 @@ public class BoneLocal: NSObject { public var inherit: Inherit { get { let result = spine_bone_local_get_inherit(_ptr.assumingMemoryBound(to: spine_bone_local_wrapper.self)) - return Inherit(rawValue: Int32(result.rawValue))! + return Inherit(rawValue: Int32(result.rawValue))! } set { - spine_bone_local_set_inherit( - _ptr.assumingMemoryBound(to: spine_bone_local_wrapper.self), spine_inherit(rawValue: UInt32(newValue.rawValue))) + spine_bone_local_set_inherit(_ptr.assumingMemoryBound(to: spine_bone_local_wrapper.self), spine_inherit(rawValue: UInt32(newValue.rawValue))) } } @@ -145,8 +144,7 @@ public class BoneLocal: NSObject { } public func set(_ pose: BoneLocal) { - spine_bone_local_set( - _ptr.assumingMemoryBound(to: spine_bone_local_wrapper.self), pose._ptr.assumingMemoryBound(to: spine_bone_local_wrapper.self)) + spine_bone_local_set(_ptr.assumingMemoryBound(to: spine_bone_local_wrapper.self), pose._ptr.assumingMemoryBound(to: spine_bone_local_wrapper.self)) } public func setPosition(_ x: Float, _ y: Float) { @@ -160,4 +158,4 @@ public class BoneLocal: NSObject { public func dispose() { spine_bone_local_dispose(_ptr.assumingMemoryBound(to: spine_bone_local_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/bone_pose.swift b/spine-ios/Sources/SpineSwift/Generated/bone_pose.swift index 802a77710..b31717bd4 100644 --- a/spine-ios/Sources/SpineSwift/Generated/bone_pose.swift +++ b/spine-ios/Sources/SpineSwift/Generated/bone_pose.swift @@ -57,7 +57,7 @@ public class BonePose: BoneLocal, Update { public var a: Float { get { let result = spine_bone_pose_get_a(_ptr.assumingMemoryBound(to: spine_bone_pose_wrapper.self)) - return result + return result } set { spine_bone_pose_set_a(_ptr.assumingMemoryBound(to: spine_bone_pose_wrapper.self), newValue) @@ -69,7 +69,7 @@ public class BonePose: BoneLocal, Update { public var b: Float { get { let result = spine_bone_pose_get_b(_ptr.assumingMemoryBound(to: spine_bone_pose_wrapper.self)) - return result + return result } set { spine_bone_pose_set_b(_ptr.assumingMemoryBound(to: spine_bone_pose_wrapper.self), newValue) @@ -81,7 +81,7 @@ public class BonePose: BoneLocal, Update { public var c: Float { get { let result = spine_bone_pose_get_c(_ptr.assumingMemoryBound(to: spine_bone_pose_wrapper.self)) - return result + return result } set { spine_bone_pose_set_c(_ptr.assumingMemoryBound(to: spine_bone_pose_wrapper.self), newValue) @@ -93,7 +93,7 @@ public class BonePose: BoneLocal, Update { public var d: Float { get { let result = spine_bone_pose_get_d(_ptr.assumingMemoryBound(to: spine_bone_pose_wrapper.self)) - return result + return result } set { spine_bone_pose_set_d(_ptr.assumingMemoryBound(to: spine_bone_pose_wrapper.self), newValue) @@ -104,7 +104,7 @@ public class BonePose: BoneLocal, Update { public var worldX: Float { get { let result = spine_bone_pose_get_world_x(_ptr.assumingMemoryBound(to: spine_bone_pose_wrapper.self)) - return result + return result } set { spine_bone_pose_set_world_x(_ptr.assumingMemoryBound(to: spine_bone_pose_wrapper.self), newValue) @@ -115,7 +115,7 @@ public class BonePose: BoneLocal, Update { public var worldY: Float { get { let result = spine_bone_pose_get_world_y(_ptr.assumingMemoryBound(to: spine_bone_pose_wrapper.self)) - return result + return result } set { spine_bone_pose_set_world_y(_ptr.assumingMemoryBound(to: spine_bone_pose_wrapper.self), newValue) @@ -148,9 +148,7 @@ public class BonePose: BoneLocal, Update { /// Called by Skeleton::updateCache() to compute the world transform, if needed. public func update(_ skeleton: Skeleton, _ physics: Physics) { - spine_bone_pose_update( - _ptr.assumingMemoryBound(to: spine_bone_pose_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self), - spine_physics(rawValue: UInt32(physics.rawValue))) + spine_bone_pose_update(_ptr.assumingMemoryBound(to: spine_bone_pose_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self), spine_physics(rawValue: UInt32(physics.rawValue))) } /// Computes the world transform using the parent bone's applied pose and this pose. Child bones @@ -158,8 +156,7 @@ public class BonePose: BoneLocal, Update { /// /// See World transforms in the Spine Runtimes Guide. public func updateWorldTransform(_ skeleton: Skeleton) { - spine_bone_pose_update_world_transform( - _ptr.assumingMemoryBound(to: spine_bone_pose_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) + spine_bone_pose_update_world_transform(_ptr.assumingMemoryBound(to: spine_bone_pose_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) } /// Computes the local transform values from the world transform. @@ -167,25 +164,22 @@ public class BonePose: BoneLocal, Update { /// If the world transform is modified (by a constraint, rotateWorld(), etc) then this method /// should be called so the local transform matches the world transform. The local transform may /// be needed by other code (eg to apply another constraint). - /// +/// /// Some information is ambiguous in the world transform, such as -1,-1 scale versus 180 /// rotation. The local transform after calling this method is equivalent to the local transform /// used to compute the world transform, but may not be identical. public func updateLocalTransform(_ skeleton: Skeleton) { - spine_bone_pose_update_local_transform( - _ptr.assumingMemoryBound(to: spine_bone_pose_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) + spine_bone_pose_update_local_transform(_ptr.assumingMemoryBound(to: spine_bone_pose_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) } /// If the world transform has been modified and the local transform no longer matches, /// updateLocalTransform() is called. public func validateLocalTransform(_ skeleton: Skeleton) { - spine_bone_pose_validate_local_transform( - _ptr.assumingMemoryBound(to: spine_bone_pose_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) + spine_bone_pose_validate_local_transform(_ptr.assumingMemoryBound(to: spine_bone_pose_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) } public func modifyLocal(_ skeleton: Skeleton) { - spine_bone_pose_modify_local( - _ptr.assumingMemoryBound(to: spine_bone_pose_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) + spine_bone_pose_modify_local(_ptr.assumingMemoryBound(to: spine_bone_pose_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) } public func modifyWorld(_ update: Int32) { @@ -224,4 +218,4 @@ public class BonePose: BoneLocal, Update { public override func dispose() { spine_bone_pose_dispose(_ptr.assumingMemoryBound(to: spine_bone_pose_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/bone_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/bone_timeline.swift index 509497492..38d9d1a39 100644 --- a/spine-ios/Sources/SpineSwift/Generated/bone_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/bone_timeline.swift @@ -38,4 +38,4 @@ public protocol BoneTimeline { var rtti: Rtti { get } var boneIndex: Int32 { get set } static func rttiStatic() -> Rtti -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/bone_timeline1.swift b/spine-ios/Sources/SpineSwift/Generated/bone_timeline1.swift index 69f46b6f8..7ca2bb894 100644 --- a/spine-ios/Sources/SpineSwift/Generated/bone_timeline1.swift +++ b/spine-ios/Sources/SpineSwift/Generated/bone_timeline1.swift @@ -44,11 +44,11 @@ open class BoneTimeline1: CurveTimeline1, BoneTimeline { public var boneIndex: Int32 { get { let result = spine_bone_timeline1_get_bone_index(_ptr.assumingMemoryBound(to: spine_bone_timeline1_wrapper.self)) - return result + return result } set { spine_bone_timeline1_set_bone_index(_ptr.assumingMemoryBound(to: spine_bone_timeline1_wrapper.self), newValue) } } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/bone_timeline2.swift b/spine-ios/Sources/SpineSwift/Generated/bone_timeline2.swift index f4da0c49c..d9c589e5c 100644 --- a/spine-ios/Sources/SpineSwift/Generated/bone_timeline2.swift +++ b/spine-ios/Sources/SpineSwift/Generated/bone_timeline2.swift @@ -44,7 +44,7 @@ open class BoneTimeline2: CurveTimeline, BoneTimeline { public var boneIndex: Int32 { get { let result = spine_bone_timeline2_get_bone_index(_ptr.assumingMemoryBound(to: spine_bone_timeline2_wrapper.self)) - return result + return result } set { spine_bone_timeline2_set_bone_index(_ptr.assumingMemoryBound(to: spine_bone_timeline2_wrapper.self), newValue) @@ -55,4 +55,4 @@ open class BoneTimeline2: CurveTimeline, BoneTimeline { spine_bone_timeline2_set_frame(_ptr.assumingMemoryBound(to: spine_bone_timeline2_wrapper.self), frame, time, value1, value2) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/bounding_box_attachment.swift b/spine-ios/Sources/SpineSwift/Generated/bounding_box_attachment.swift index 4cccd888f..b47ebc180 100644 --- a/spine-ios/Sources/SpineSwift/Generated/bounding_box_attachment.swift +++ b/spine-ios/Sources/SpineSwift/Generated/bounding_box_attachment.swift @@ -54,4 +54,4 @@ public class BoundingBoxAttachment: VertexAttachment { public func dispose() { spine_bounding_box_attachment_dispose(_ptr.assumingMemoryBound(to: spine_bounding_box_attachment_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/clipping_attachment.swift b/spine-ios/Sources/SpineSwift/Generated/clipping_attachment.swift index b05c357a3..cb06b0e70 100644 --- a/spine-ios/Sources/SpineSwift/Generated/clipping_attachment.swift +++ b/spine-ios/Sources/SpineSwift/Generated/clipping_attachment.swift @@ -49,12 +49,10 @@ public class ClippingAttachment: VertexAttachment { public var endSlot: SlotData? { get { let result = spine_clipping_attachment_get_end_slot(_ptr.assumingMemoryBound(to: spine_clipping_attachment_wrapper.self)) - return result.map { SlotData(fromPointer: $0) } + return result.map { SlotData(fromPointer: $0) } } set { - spine_clipping_attachment_set_end_slot( - _ptr.assumingMemoryBound(to: spine_clipping_attachment_wrapper.self), - newValue?._ptr.assumingMemoryBound(to: spine_slot_data_wrapper.self)) + spine_clipping_attachment_set_end_slot(_ptr.assumingMemoryBound(to: spine_clipping_attachment_wrapper.self), newValue?._ptr.assumingMemoryBound(to: spine_slot_data_wrapper.self)) } } @@ -66,4 +64,4 @@ public class ClippingAttachment: VertexAttachment { public func dispose() { spine_clipping_attachment_dispose(_ptr.assumingMemoryBound(to: spine_clipping_attachment_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/constraint_data.swift b/spine-ios/Sources/SpineSwift/Generated/constraint_data.swift index e610a49ea..8471457e0 100644 --- a/spine-ios/Sources/SpineSwift/Generated/constraint_data.swift +++ b/spine-ios/Sources/SpineSwift/Generated/constraint_data.swift @@ -40,4 +40,4 @@ public protocol ConstraintData { var skinRequired: Bool { get } func createMethod(_ skeleton: Skeleton) -> Constraint static func rttiStatic() -> Rtti -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/constraint_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/constraint_timeline.swift index f822ed3a6..cf3a8ac88 100644 --- a/spine-ios/Sources/SpineSwift/Generated/constraint_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/constraint_timeline.swift @@ -38,4 +38,4 @@ public protocol ConstraintTimeline { var rtti: Rtti { get } var constraintIndex: Int32 { get set } static func rttiStatic() -> Rtti -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/constraint_timeline1.swift b/spine-ios/Sources/SpineSwift/Generated/constraint_timeline1.swift index 05365b8a8..be02a6f64 100644 --- a/spine-ios/Sources/SpineSwift/Generated/constraint_timeline1.swift +++ b/spine-ios/Sources/SpineSwift/Generated/constraint_timeline1.swift @@ -44,11 +44,11 @@ open class ConstraintTimeline1: CurveTimeline1, ConstraintTimeline { public var constraintIndex: Int32 { get { let result = spine_constraint_timeline1_get_constraint_index(_ptr.assumingMemoryBound(to: spine_constraint_timeline1_wrapper.self)) - return result + return result } set { spine_constraint_timeline1_set_constraint_index(_ptr.assumingMemoryBound(to: spine_constraint_timeline1_wrapper.self), newValue) } } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/curve_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/curve_timeline.swift index dd8b1e246..420083f03 100644 --- a/spine-ios/Sources/SpineSwift/Generated/curve_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/curve_timeline.swift @@ -60,18 +60,13 @@ open class CurveTimeline: Timeline { return ArrayFloat(fromPointer: result!) } - public func setBezier( - _ bezier: Int, _ frame: Int, _ value: Float, _ time1: Float, _ value1: Float, _ cx1: Float, _ cy1: Float, _ cx2: Float, _ cy2: Float, - _ time2: Float, _ value2: Float - ) { - spine_curve_timeline_set_bezier( - _ptr.assumingMemoryBound(to: spine_curve_timeline_wrapper.self), bezier, frame, value, time1, value1, cx1, cy1, cx2, cy2, time2, value2) + public func setBezier(_ bezier: Int, _ frame: Int, _ value: Float, _ time1: Float, _ value1: Float, _ cx1: Float, _ cy1: Float, _ cx2: Float, _ cy2: Float, _ time2: Float, _ value2: Float) { + spine_curve_timeline_set_bezier(_ptr.assumingMemoryBound(to: spine_curve_timeline_wrapper.self), bezier, frame, value, time1, value1, cx1, cy1, cx2, cy2, time2, value2) } public func getBezierValue(_ time: Float, _ frame: Int, _ valueOffset: Int, _ i: Int) -> Float { - let result = spine_curve_timeline_get_bezier_value( - _ptr.assumingMemoryBound(to: spine_curve_timeline_wrapper.self), time, frame, valueOffset, i) + let result = spine_curve_timeline_get_bezier_value(_ptr.assumingMemoryBound(to: spine_curve_timeline_wrapper.self), time, frame, valueOffset, i) return result } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/curve_timeline1.swift b/spine-ios/Sources/SpineSwift/Generated/curve_timeline1.swift index 20673afad..a75e5bbe6 100644 --- a/spine-ios/Sources/SpineSwift/Generated/curve_timeline1.swift +++ b/spine-ios/Sources/SpineSwift/Generated/curve_timeline1.swift @@ -56,32 +56,23 @@ open class CurveTimeline1: CurveTimeline { } public func getRelativeValue(_ time: Float, _ alpha: Float, _ blend: MixBlend, _ current: Float, _ setup: Float) -> Float { - let result = spine_curve_timeline1_get_relative_value( - _ptr.assumingMemoryBound(to: spine_curve_timeline1_wrapper.self), time, alpha, spine_mix_blend(rawValue: UInt32(blend.rawValue)), current, - setup) + let result = spine_curve_timeline1_get_relative_value(_ptr.assumingMemoryBound(to: spine_curve_timeline1_wrapper.self), time, alpha, spine_mix_blend(rawValue: UInt32(blend.rawValue)), current, setup) return result } - public func getScaleValue(_ time: Float, _ alpha: Float, _ blend: MixBlend, _ direction: MixDirection, _ current: Float, _ setup: Float) -> Float - { - let result = spine_curve_timeline1_get_scale_value( - _ptr.assumingMemoryBound(to: spine_curve_timeline1_wrapper.self), time, alpha, spine_mix_blend(rawValue: UInt32(blend.rawValue)), - spine_mix_direction(rawValue: UInt32(direction.rawValue)), current, setup) + public func getScaleValue(_ time: Float, _ alpha: Float, _ blend: MixBlend, _ direction: MixDirection, _ current: Float, _ setup: Float) -> Float { + let result = spine_curve_timeline1_get_scale_value(_ptr.assumingMemoryBound(to: spine_curve_timeline1_wrapper.self), time, alpha, spine_mix_blend(rawValue: UInt32(blend.rawValue)), spine_mix_direction(rawValue: UInt32(direction.rawValue)), current, setup) return result } public func getAbsoluteValue(_ time: Float, _ alpha: Float, _ blend: MixBlend, _ current: Float, _ setup: Float) -> Float { - let result = spine_curve_timeline1_get_absolute_value_1( - _ptr.assumingMemoryBound(to: spine_curve_timeline1_wrapper.self), time, alpha, spine_mix_blend(rawValue: UInt32(blend.rawValue)), current, - setup) + let result = spine_curve_timeline1_get_absolute_value_1(_ptr.assumingMemoryBound(to: spine_curve_timeline1_wrapper.self), time, alpha, spine_mix_blend(rawValue: UInt32(blend.rawValue)), current, setup) return result } public func getAbsoluteValue2(_ time: Float, _ alpha: Float, _ blend: MixBlend, _ current: Float, _ setup: Float, _ value: Float) -> Float { - let result = spine_curve_timeline1_get_absolute_value_2( - _ptr.assumingMemoryBound(to: spine_curve_timeline1_wrapper.self), time, alpha, spine_mix_blend(rawValue: UInt32(blend.rawValue)), current, - setup, value) + let result = spine_curve_timeline1_get_absolute_value_2(_ptr.assumingMemoryBound(to: spine_curve_timeline1_wrapper.self), time, alpha, spine_mix_blend(rawValue: UInt32(blend.rawValue)), current, setup, value) return result } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/deform_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/deform_timeline.swift index 2a858af03..ab08a8a8c 100644 --- a/spine-ios/Sources/SpineSwift/Generated/deform_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/deform_timeline.swift @@ -42,8 +42,7 @@ public class DeformTimeline: SlotCurveTimeline { } public convenience init(_ frameCount: Int, _ bezierCount: Int, _ slotIndex: Int32, _ attachment: VertexAttachment) { - let ptr = spine_deform_timeline_create( - frameCount, bezierCount, slotIndex, attachment._ptr.assumingMemoryBound(to: spine_vertex_attachment_wrapper.self)) + let ptr = spine_deform_timeline_create(frameCount, bezierCount, slotIndex, attachment._ptr.assumingMemoryBound(to: spine_vertex_attachment_wrapper.self)) self.init(fromPointer: ptr!) } @@ -51,37 +50,33 @@ public class DeformTimeline: SlotCurveTimeline { public var attachment: VertexAttachment { 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 rttiClassName = String(cString: spine_rtti_get_class_name(rtti)!) - switch rttiClassName { - case "BoundingBoxAttachment": - let castedPtr = spine_vertex_attachment_cast_to_bounding_box_attachment(result!) - return BoundingBoxAttachment(fromPointer: castedPtr!) - case "ClippingAttachment": - let castedPtr = spine_vertex_attachment_cast_to_clipping_attachment(result!) - return ClippingAttachment(fromPointer: castedPtr!) - case "MeshAttachment": - let castedPtr = spine_vertex_attachment_cast_to_mesh_attachment(result!) - return MeshAttachment(fromPointer: castedPtr!) - case "PathAttachment": - let castedPtr = spine_vertex_attachment_cast_to_path_attachment(result!) - return PathAttachment(fromPointer: castedPtr!) - default: - fatalError("Unknown concrete type: \(rttiClassName) for abstract class VertexAttachment") - } + let rtti = spine_vertex_attachment_get_rtti(result!) + let rttiClassName = String(cString: spine_rtti_get_class_name(rtti)!) + switch rttiClassName { + case "BoundingBoxAttachment": + let castedPtr = spine_vertex_attachment_cast_to_bounding_box_attachment(result!) + return BoundingBoxAttachment(fromPointer: castedPtr!) + case "ClippingAttachment": + let castedPtr = spine_vertex_attachment_cast_to_clipping_attachment(result!) + return ClippingAttachment(fromPointer: castedPtr!) + case "MeshAttachment": + let castedPtr = spine_vertex_attachment_cast_to_mesh_attachment(result!) + return MeshAttachment(fromPointer: castedPtr!) + case "PathAttachment": + let castedPtr = spine_vertex_attachment_cast_to_path_attachment(result!) + return PathAttachment(fromPointer: castedPtr!) + default: + fatalError("Unknown concrete type: \(rttiClassName) for abstract class VertexAttachment") + } } set { - spine_deform_timeline_set_attachment( - _ptr.assumingMemoryBound(to: spine_deform_timeline_wrapper.self), - newValue._ptr.assumingMemoryBound(to: spine_vertex_attachment_wrapper.self)) + spine_deform_timeline_set_attachment(_ptr.assumingMemoryBound(to: spine_deform_timeline_wrapper.self), newValue._ptr.assumingMemoryBound(to: spine_vertex_attachment_wrapper.self)) } } /// Sets the time and vertices for the specified frame. public func setFrame(_ frameIndex: Int32, _ time: Float, _ vertices: ArrayFloat) { - spine_deform_timeline_set_frame( - _ptr.assumingMemoryBound(to: spine_deform_timeline_wrapper.self), frameIndex, time, - vertices._ptr.assumingMemoryBound(to: spine_array_float_wrapper.self)) + spine_deform_timeline_set_frame(_ptr.assumingMemoryBound(to: spine_deform_timeline_wrapper.self), frameIndex, time, vertices._ptr.assumingMemoryBound(to: spine_array_float_wrapper.self)) } public func getCurvePercent(_ time: Float, _ frame: Int32) -> Float { @@ -92,4 +87,4 @@ public class DeformTimeline: SlotCurveTimeline { public func dispose() { spine_deform_timeline_dispose(_ptr.assumingMemoryBound(to: spine_deform_timeline_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/draw_order_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/draw_order_timeline.swift index cec012f42..1037f26ea 100644 --- a/spine-ios/Sources/SpineSwift/Generated/draw_order_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/draw_order_timeline.swift @@ -52,12 +52,10 @@ public class DrawOrderTimeline: Timeline { /// - Parameter time: The frame time in seconds. /// - Parameter drawOrder: For each slot in Skeleton::slots, the index of the slot in the new draw order. May be null to use setup pose draw order. public func setFrame(_ frame: Int, _ time: Float, _ drawOrder: ArrayInt?) { - spine_draw_order_timeline_set_frame( - _ptr.assumingMemoryBound(to: spine_draw_order_timeline_wrapper.self), frame, time, - drawOrder?._ptr.assumingMemoryBound(to: spine_array_int_wrapper.self)) + spine_draw_order_timeline_set_frame(_ptr.assumingMemoryBound(to: spine_draw_order_timeline_wrapper.self), frame, time, drawOrder?._ptr.assumingMemoryBound(to: spine_array_int_wrapper.self)) } public func dispose() { spine_draw_order_timeline_dispose(_ptr.assumingMemoryBound(to: spine_draw_order_timeline_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/event_data.swift b/spine-ios/Sources/SpineSwift/Generated/event_data.swift index 3b40f9bb6..646bff045 100644 --- a/spine-ios/Sources/SpineSwift/Generated/event_data.swift +++ b/spine-ios/Sources/SpineSwift/Generated/event_data.swift @@ -57,7 +57,7 @@ public class EventData: NSObject { public var intValue: Int32 { get { let result = spine_event_data_get_int(_ptr.assumingMemoryBound(to: spine_event_data_wrapper.self)) - return result + return result } set { spine_event_data_set_int(_ptr.assumingMemoryBound(to: spine_event_data_wrapper.self), newValue) @@ -67,7 +67,7 @@ public class EventData: NSObject { public var floatValue: Float { get { let result = spine_event_data_get_float(_ptr.assumingMemoryBound(to: spine_event_data_wrapper.self)) - return result + return result } set { spine_event_data_set_float(_ptr.assumingMemoryBound(to: spine_event_data_wrapper.self), newValue) @@ -77,7 +77,7 @@ public class EventData: NSObject { public var stringValue: String { get { let result = spine_event_data_get_string(_ptr.assumingMemoryBound(to: spine_event_data_wrapper.self)) - return String(cString: result!) + return String(cString: result!) } set { spine_event_data_set_string(_ptr.assumingMemoryBound(to: spine_event_data_wrapper.self), newValue) @@ -87,7 +87,7 @@ public class EventData: NSObject { public var audioPath: String { get { let result = spine_event_data_get_audio_path(_ptr.assumingMemoryBound(to: spine_event_data_wrapper.self)) - return String(cString: result!) + return String(cString: result!) } set { spine_event_data_set_audio_path(_ptr.assumingMemoryBound(to: spine_event_data_wrapper.self), newValue) @@ -97,7 +97,7 @@ public class EventData: NSObject { public var volume: Float { get { let result = spine_event_data_get_volume(_ptr.assumingMemoryBound(to: spine_event_data_wrapper.self)) - return result + return result } set { spine_event_data_set_volume(_ptr.assumingMemoryBound(to: spine_event_data_wrapper.self), newValue) @@ -107,7 +107,7 @@ public class EventData: NSObject { public var balance: Float { get { let result = spine_event_data_get_balance(_ptr.assumingMemoryBound(to: spine_event_data_wrapper.self)) - return result + return result } set { spine_event_data_set_balance(_ptr.assumingMemoryBound(to: spine_event_data_wrapper.self), newValue) @@ -117,4 +117,4 @@ public class EventData: NSObject { public func dispose() { spine_event_data_dispose(_ptr.assumingMemoryBound(to: spine_event_data_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/event_queue_entry.swift b/spine-ios/Sources/SpineSwift/Generated/event_queue_entry.swift index 6ca5c593c..c046ed239 100644 --- a/spine-ios/Sources/SpineSwift/Generated/event_queue_entry.swift +++ b/spine-ios/Sources/SpineSwift/Generated/event_queue_entry.swift @@ -44,47 +44,41 @@ public class EventQueueEntry: NSObject { } public convenience init(_ eventType: EventType, _ trackEntry: TrackEntry?, _ event: Event?) { - let ptr = spine_event_queue_entry_create( - spine_event_type(rawValue: UInt32(eventType.rawValue)), trackEntry?._ptr.assumingMemoryBound(to: spine_track_entry_wrapper.self), - event?._ptr.assumingMemoryBound(to: spine_event_wrapper.self)) + let ptr = spine_event_queue_entry_create(spine_event_type(rawValue: UInt32(eventType.rawValue)), trackEntry?._ptr.assumingMemoryBound(to: spine_track_entry_wrapper.self), event?._ptr.assumingMemoryBound(to: spine_event_wrapper.self)) self.init(fromPointer: ptr!) } public var type: EventType { get { let result = spine_event_queue_entry_get__type(_ptr.assumingMemoryBound(to: spine_event_queue_entry_wrapper.self)) - return EventType(rawValue: Int32(result.rawValue))! + return EventType(rawValue: Int32(result.rawValue))! } set { - spine_event_queue_entry_set__type( - _ptr.assumingMemoryBound(to: spine_event_queue_entry_wrapper.self), spine_event_type(rawValue: UInt32(newValue.rawValue))) + spine_event_queue_entry_set__type(_ptr.assumingMemoryBound(to: spine_event_queue_entry_wrapper.self), spine_event_type(rawValue: UInt32(newValue.rawValue))) } } public var entry: TrackEntry? { get { let result = spine_event_queue_entry_get__entry(_ptr.assumingMemoryBound(to: spine_event_queue_entry_wrapper.self)) - return result.map { TrackEntry(fromPointer: $0) } + return result.map { TrackEntry(fromPointer: $0) } } set { - spine_event_queue_entry_set__entry( - _ptr.assumingMemoryBound(to: spine_event_queue_entry_wrapper.self), - newValue?._ptr.assumingMemoryBound(to: spine_track_entry_wrapper.self)) + spine_event_queue_entry_set__entry(_ptr.assumingMemoryBound(to: spine_event_queue_entry_wrapper.self), newValue?._ptr.assumingMemoryBound(to: spine_track_entry_wrapper.self)) } } public var event: Event? { get { let result = spine_event_queue_entry_get__event(_ptr.assumingMemoryBound(to: spine_event_queue_entry_wrapper.self)) - return result.map { Event(fromPointer: $0) } + return result.map { Event(fromPointer: $0) } } set { - spine_event_queue_entry_set__event( - _ptr.assumingMemoryBound(to: spine_event_queue_entry_wrapper.self), newValue?._ptr.assumingMemoryBound(to: spine_event_wrapper.self)) + spine_event_queue_entry_set__event(_ptr.assumingMemoryBound(to: spine_event_queue_entry_wrapper.self), newValue?._ptr.assumingMemoryBound(to: spine_event_wrapper.self)) } } public func dispose() { spine_event_queue_entry_dispose(_ptr.assumingMemoryBound(to: spine_event_queue_entry_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/event_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/event_timeline.swift index 893c74f8c..2ca8eb241 100644 --- a/spine-ios/Sources/SpineSwift/Generated/event_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/event_timeline.swift @@ -56,11 +56,10 @@ public class EventTimeline: Timeline { /// /// - Parameter frame: Between 0 and frameCount, inclusive. public func setFrame(_ frame: Int, _ event: Event) { - spine_event_timeline_set_frame( - _ptr.assumingMemoryBound(to: spine_event_timeline_wrapper.self), frame, event._ptr.assumingMemoryBound(to: spine_event_wrapper.self)) + spine_event_timeline_set_frame(_ptr.assumingMemoryBound(to: spine_event_timeline_wrapper.self), frame, event._ptr.assumingMemoryBound(to: spine_event_wrapper.self)) } public func dispose() { spine_event_timeline_dispose(_ptr.assumingMemoryBound(to: spine_event_timeline_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/event_type.swift b/spine-ios/Sources/SpineSwift/Generated/event_type.swift index 0720ff776..052443823 100644 --- a/spine-ios/Sources/SpineSwift/Generated/event_type.swift +++ b/spine-ios/Sources/SpineSwift/Generated/event_type.swift @@ -43,4 +43,4 @@ public enum EventType: Int32, CaseIterable { public static func fromValue(_ value: Int32) -> EventType? { return EventType(rawValue: value) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/format.swift b/spine-ios/Sources/SpineSwift/Generated/format.swift index 4a7713976..56ffd5d33 100644 --- a/spine-ios/Sources/SpineSwift/Generated/format.swift +++ b/spine-ios/Sources/SpineSwift/Generated/format.swift @@ -44,4 +44,4 @@ public enum Format: Int32, CaseIterable { public static func fromValue(_ value: Int32) -> Format? { return Format(rawValue: value) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/from_property.swift b/spine-ios/Sources/SpineSwift/Generated/from_property.swift index 3eab626c8..aae78bc40 100644 --- a/spine-ios/Sources/SpineSwift/Generated/from_property.swift +++ b/spine-ios/Sources/SpineSwift/Generated/from_property.swift @@ -51,7 +51,7 @@ open class FromProperty: NSObject { public var offset: Float { get { let result = spine_from_property_get__offset(_ptr.assumingMemoryBound(to: spine_from_property_wrapper.self)) - return result + return result } set { spine_from_property_set__offset(_ptr.assumingMemoryBound(to: spine_from_property_wrapper.self), newValue) @@ -61,12 +61,10 @@ open class FromProperty: NSObject { public var to: ArrayToProperty? { get { let result = spine_from_property_get__to(_ptr.assumingMemoryBound(to: spine_from_property_wrapper.self)) - return result.map { ArrayToProperty(fromPointer: $0) } + return result.map { ArrayToProperty(fromPointer: $0) } } set { - spine_from_property_set__to( - _ptr.assumingMemoryBound(to: spine_from_property_wrapper.self), - newValue?._ptr.assumingMemoryBound(to: spine_array_to_property_wrapper.self)) + spine_from_property_set__to(_ptr.assumingMemoryBound(to: spine_from_property_wrapper.self), newValue?._ptr.assumingMemoryBound(to: spine_array_to_property_wrapper.self)) } } @@ -75,4 +73,4 @@ open class FromProperty: NSObject { return Rtti(fromPointer: result!) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/from_rotate.swift b/spine-ios/Sources/SpineSwift/Generated/from_rotate.swift index c3e6e16b0..8fe1a2033 100644 --- a/spine-ios/Sources/SpineSwift/Generated/from_rotate.swift +++ b/spine-ios/Sources/SpineSwift/Generated/from_rotate.swift @@ -49,4 +49,4 @@ public class FromRotate: FromProperty { public func dispose() { spine_from_rotate_dispose(_ptr.assumingMemoryBound(to: spine_from_rotate_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/from_scale_x.swift b/spine-ios/Sources/SpineSwift/Generated/from_scale_x.swift index 471bbbc87..00e5a035f 100644 --- a/spine-ios/Sources/SpineSwift/Generated/from_scale_x.swift +++ b/spine-ios/Sources/SpineSwift/Generated/from_scale_x.swift @@ -49,4 +49,4 @@ public class FromScaleX: FromProperty { public func dispose() { spine_from_scale_x_dispose(_ptr.assumingMemoryBound(to: spine_from_scale_x_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/from_scale_y.swift b/spine-ios/Sources/SpineSwift/Generated/from_scale_y.swift index 30a14294c..888354601 100644 --- a/spine-ios/Sources/SpineSwift/Generated/from_scale_y.swift +++ b/spine-ios/Sources/SpineSwift/Generated/from_scale_y.swift @@ -49,4 +49,4 @@ public class FromScaleY: FromProperty { public func dispose() { spine_from_scale_y_dispose(_ptr.assumingMemoryBound(to: spine_from_scale_y_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/from_shear_y.swift b/spine-ios/Sources/SpineSwift/Generated/from_shear_y.swift index 23227dd63..cbab7d8c1 100644 --- a/spine-ios/Sources/SpineSwift/Generated/from_shear_y.swift +++ b/spine-ios/Sources/SpineSwift/Generated/from_shear_y.swift @@ -49,4 +49,4 @@ public class FromShearY: FromProperty { public func dispose() { spine_from_shear_y_dispose(_ptr.assumingMemoryBound(to: spine_from_shear_y_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/from_x.swift b/spine-ios/Sources/SpineSwift/Generated/from_x.swift index 9982b4114..c1025416b 100644 --- a/spine-ios/Sources/SpineSwift/Generated/from_x.swift +++ b/spine-ios/Sources/SpineSwift/Generated/from_x.swift @@ -49,4 +49,4 @@ public class FromX: FromProperty { public func dispose() { spine_from_x_dispose(_ptr.assumingMemoryBound(to: spine_from_x_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/from_y.swift b/spine-ios/Sources/SpineSwift/Generated/from_y.swift index 7e9bfc9b6..b4633ab39 100644 --- a/spine-ios/Sources/SpineSwift/Generated/from_y.swift +++ b/spine-ios/Sources/SpineSwift/Generated/from_y.swift @@ -49,4 +49,4 @@ public class FromY: FromProperty { public func dispose() { spine_from_y_dispose(_ptr.assumingMemoryBound(to: spine_from_y_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/ik_constraint.swift b/spine-ios/Sources/SpineSwift/Generated/ik_constraint.swift index 5196180ca..65f72ea3c 100644 --- a/spine-ios/Sources/SpineSwift/Generated/ik_constraint.swift +++ b/spine-ios/Sources/SpineSwift/Generated/ik_constraint.swift @@ -42,9 +42,7 @@ public class IkConstraint: IkConstraintBase { } public convenience init(_ data: IkConstraintData, _ skeleton: Skeleton) { - let ptr = spine_ik_constraint_create( - data._ptr.assumingMemoryBound(to: spine_ik_constraint_data_wrapper.self), - skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) + let ptr = spine_ik_constraint_create(data._ptr.assumingMemoryBound(to: spine_ik_constraint_data_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) self.init(fromPointer: ptr!) } @@ -56,44 +54,33 @@ public class IkConstraint: IkConstraintBase { public var target: Bone { get { let result = spine_ik_constraint_get_target(_ptr.assumingMemoryBound(to: spine_ik_constraint_wrapper.self)) - return Bone(fromPointer: result!) + return Bone(fromPointer: result!) } set { - spine_ik_constraint_set_target( - _ptr.assumingMemoryBound(to: spine_ik_constraint_wrapper.self), newValue._ptr.assumingMemoryBound(to: spine_bone_wrapper.self)) + spine_ik_constraint_set_target(_ptr.assumingMemoryBound(to: spine_ik_constraint_wrapper.self), newValue._ptr.assumingMemoryBound(to: spine_bone_wrapper.self)) } } public func copyAttachment(_ skeleton: Skeleton) -> IkConstraint { - let result = spine_ik_constraint_copy( - _ptr.assumingMemoryBound(to: spine_ik_constraint_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) + let result = spine_ik_constraint_copy(_ptr.assumingMemoryBound(to: spine_ik_constraint_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) return IkConstraint(fromPointer: result!) } /// Adjusts the bone rotation so the tip is as close to the target position as possible. The /// target is specified in the world coordinate system. - public static func apply( - _ skeleton: Skeleton, _ bone: BonePose, _ targetX: Float, _ targetY: Float, _ compress: Bool, _ stretch: Bool, _ uniform: Bool, _ mix: Float - ) { - spine_ik_constraint_apply_1( - skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self), bone._ptr.assumingMemoryBound(to: spine_bone_pose_wrapper.self), - targetX, targetY, compress, stretch, uniform, mix) + public static func apply(_ skeleton: Skeleton, _ bone: BonePose, _ targetX: Float, _ targetY: Float, _ compress: Bool, _ stretch: Bool, _ uniform: Bool, _ mix: Float) { + spine_ik_constraint_apply_1(skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self), bone._ptr.assumingMemoryBound(to: spine_bone_pose_wrapper.self), targetX, targetY, compress, stretch, uniform, mix) } /// Adjusts the parent and child bone rotations so the tip of the child is as close to the /// target position as possible. The target is specified in the world coordinate system. /// /// - Parameter child: A direct descendant of the parent bone. - public static func apply2( - _ skeleton: Skeleton, _ parent: BonePose, _ child: BonePose, _ targetX: Float, _ targetY: Float, _ bendDirection: Int32, _ stretch: Bool, - _ uniform: Bool, _ softness: Float, _ mix: Float - ) { - spine_ik_constraint_apply_2( - skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self), parent._ptr.assumingMemoryBound(to: spine_bone_pose_wrapper.self), - child._ptr.assumingMemoryBound(to: spine_bone_pose_wrapper.self), targetX, targetY, bendDirection, stretch, uniform, softness, mix) + public static func apply2(_ skeleton: Skeleton, _ parent: BonePose, _ child: BonePose, _ targetX: Float, _ targetY: Float, _ bendDirection: Int32, _ stretch: Bool, _ uniform: Bool, _ softness: Float, _ mix: Float) { + spine_ik_constraint_apply_2(skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self), parent._ptr.assumingMemoryBound(to: spine_bone_pose_wrapper.self), child._ptr.assumingMemoryBound(to: spine_bone_pose_wrapper.self), targetX, targetY, bendDirection, stretch, uniform, softness, mix) } public override func dispose() { spine_ik_constraint_dispose(_ptr.assumingMemoryBound(to: spine_ik_constraint_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/ik_constraint_base.swift b/spine-ios/Sources/SpineSwift/Generated/ik_constraint_base.swift index a64967c93..75ebf0894 100644 --- a/spine-ios/Sources/SpineSwift/Generated/ik_constraint_base.swift +++ b/spine-ios/Sources/SpineSwift/Generated/ik_constraint_base.swift @@ -80,15 +80,12 @@ open class IkConstraintBase: PosedActive, Posed, Constraint { } public func sort(_ skeleton: Skeleton) { - spine_ik_constraint_base_sort( - _ptr.assumingMemoryBound(to: spine_ik_constraint_base_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) + spine_ik_constraint_base_sort(_ptr.assumingMemoryBound(to: spine_ik_constraint_base_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) } /// Inherited from Update public func update(_ skeleton: Skeleton, _ physics: Physics) { - spine_ik_constraint_base_update( - _ptr.assumingMemoryBound(to: spine_ik_constraint_base_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self), - spine_physics(rawValue: UInt32(physics.rawValue))) + spine_ik_constraint_base_update(_ptr.assumingMemoryBound(to: spine_ik_constraint_base_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self), spine_physics(rawValue: UInt32(physics.rawValue))) } public static func rttiStatic() -> Rtti { @@ -96,4 +93,4 @@ open class IkConstraintBase: PosedActive, Posed, Constraint { return Rtti(fromPointer: result!) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/ik_constraint_data.swift b/spine-ios/Sources/SpineSwift/Generated/ik_constraint_data.swift index 3044bb5ad..e8241a40c 100644 --- a/spine-ios/Sources/SpineSwift/Generated/ik_constraint_data.swift +++ b/spine-ios/Sources/SpineSwift/Generated/ik_constraint_data.swift @@ -61,12 +61,10 @@ public class IkConstraintData: PosedData, ConstraintData { public var target: BoneData { get { let result = spine_ik_constraint_data_get_target(_ptr.assumingMemoryBound(to: spine_ik_constraint_data_wrapper.self)) - return BoneData(fromPointer: result!) + return BoneData(fromPointer: result!) } set { - spine_ik_constraint_data_set_target( - _ptr.assumingMemoryBound(to: spine_ik_constraint_data_wrapper.self), - newValue._ptr.assumingMemoryBound(to: spine_bone_data_wrapper.self)) + spine_ik_constraint_data_set_target(_ptr.assumingMemoryBound(to: spine_ik_constraint_data_wrapper.self), newValue._ptr.assumingMemoryBound(to: spine_bone_data_wrapper.self)) } } @@ -75,7 +73,7 @@ public class IkConstraintData: PosedData, ConstraintData { public var uniform: Bool { get { let result = spine_ik_constraint_data_get_uniform(_ptr.assumingMemoryBound(to: spine_ik_constraint_data_wrapper.self)) - return result + return result } set { spine_ik_constraint_data_set_uniform(_ptr.assumingMemoryBound(to: spine_ik_constraint_data_wrapper.self), newValue) @@ -88,8 +86,7 @@ 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 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 rttiClassName = String(cString: spine_rtti_get_class_name(rtti)!) switch rttiClassName { @@ -121,4 +118,4 @@ public class IkConstraintData: PosedData, ConstraintData { public override func dispose() { spine_ik_constraint_data_dispose(_ptr.assumingMemoryBound(to: spine_ik_constraint_data_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/ik_constraint_pose.swift b/spine-ios/Sources/SpineSwift/Generated/ik_constraint_pose.swift index f65ee659e..138a9990b 100644 --- a/spine-ios/Sources/SpineSwift/Generated/ik_constraint_pose.swift +++ b/spine-ios/Sources/SpineSwift/Generated/ik_constraint_pose.swift @@ -55,7 +55,7 @@ public class IkConstraintPose: NSObject { public var mix: Float { get { let result = spine_ik_constraint_pose_get_mix(_ptr.assumingMemoryBound(to: spine_ik_constraint_pose_wrapper.self)) - return result + return result } set { spine_ik_constraint_pose_set_mix(_ptr.assumingMemoryBound(to: spine_ik_constraint_pose_wrapper.self), newValue) @@ -68,7 +68,7 @@ public class IkConstraintPose: NSObject { public var softness: Float { get { let result = spine_ik_constraint_pose_get_softness(_ptr.assumingMemoryBound(to: spine_ik_constraint_pose_wrapper.self)) - return result + return result } set { spine_ik_constraint_pose_set_softness(_ptr.assumingMemoryBound(to: spine_ik_constraint_pose_wrapper.self), newValue) @@ -79,7 +79,7 @@ public class IkConstraintPose: NSObject { public var bendDirection: Int32 { get { let result = spine_ik_constraint_pose_get_bend_direction(_ptr.assumingMemoryBound(to: spine_ik_constraint_pose_wrapper.self)) - return result + return result } set { spine_ik_constraint_pose_set_bend_direction(_ptr.assumingMemoryBound(to: spine_ik_constraint_pose_wrapper.self), newValue) @@ -90,7 +90,7 @@ public class IkConstraintPose: NSObject { public var compress: Bool { get { let result = spine_ik_constraint_pose_get_compress(_ptr.assumingMemoryBound(to: spine_ik_constraint_pose_wrapper.self)) - return result + return result } set { spine_ik_constraint_pose_set_compress(_ptr.assumingMemoryBound(to: spine_ik_constraint_pose_wrapper.self), newValue) @@ -105,7 +105,7 @@ public class IkConstraintPose: NSObject { public var stretch: Bool { get { let result = spine_ik_constraint_pose_get_stretch(_ptr.assumingMemoryBound(to: spine_ik_constraint_pose_wrapper.self)) - return result + return result } set { spine_ik_constraint_pose_set_stretch(_ptr.assumingMemoryBound(to: spine_ik_constraint_pose_wrapper.self), newValue) @@ -113,12 +113,10 @@ public class IkConstraintPose: NSObject { } public func set(_ pose: IkConstraintPose) { - spine_ik_constraint_pose_set( - _ptr.assumingMemoryBound(to: spine_ik_constraint_pose_wrapper.self), - pose._ptr.assumingMemoryBound(to: spine_ik_constraint_pose_wrapper.self)) + spine_ik_constraint_pose_set(_ptr.assumingMemoryBound(to: spine_ik_constraint_pose_wrapper.self), pose._ptr.assumingMemoryBound(to: spine_ik_constraint_pose_wrapper.self)) } public func dispose() { spine_ik_constraint_pose_dispose(_ptr.assumingMemoryBound(to: spine_ik_constraint_pose_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/ik_constraint_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/ik_constraint_timeline.swift index 7aec02463..893fe13a5 100644 --- a/spine-ios/Sources/SpineSwift/Generated/ik_constraint_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/ik_constraint_timeline.swift @@ -51,7 +51,7 @@ public class IkConstraintTimeline: CurveTimeline, ConstraintTimeline { public var constraintIndex: Int32 { get { let result = spine_ik_constraint_timeline_get_constraint_index(_ptr.assumingMemoryBound(to: spine_ik_constraint_timeline_wrapper.self)) - return result + return result } set { spine_ik_constraint_timeline_set_constraint_index(_ptr.assumingMemoryBound(to: spine_ik_constraint_timeline_wrapper.self), newValue) @@ -64,11 +64,10 @@ public class IkConstraintTimeline: CurveTimeline, ConstraintTimeline { /// - Parameter time: The frame time in seconds. /// - Parameter bendDirection: 1 or -1. public func setFrame(_ frame: Int32, _ time: Float, _ mix: Float, _ softness: Float, _ bendDirection: Int32, _ compress: Bool, _ stretch: Bool) { - spine_ik_constraint_timeline_set_frame( - _ptr.assumingMemoryBound(to: spine_ik_constraint_timeline_wrapper.self), frame, time, mix, softness, bendDirection, compress, stretch) + spine_ik_constraint_timeline_set_frame(_ptr.assumingMemoryBound(to: spine_ik_constraint_timeline_wrapper.self), frame, time, mix, softness, bendDirection, compress, stretch) } public func dispose() { spine_ik_constraint_timeline_dispose(_ptr.assumingMemoryBound(to: spine_ik_constraint_timeline_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/inherit.swift b/spine-ios/Sources/SpineSwift/Generated/inherit.swift index 1a35e0cb3..03d7371b4 100644 --- a/spine-ios/Sources/SpineSwift/Generated/inherit.swift +++ b/spine-ios/Sources/SpineSwift/Generated/inherit.swift @@ -42,4 +42,4 @@ public enum Inherit: Int32, CaseIterable { public static func fromValue(_ value: Int32) -> Inherit? { return Inherit(rawValue: value) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/inherit_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/inherit_timeline.swift index e9140a4bc..5a9a8b627 100644 --- a/spine-ios/Sources/SpineSwift/Generated/inherit_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/inherit_timeline.swift @@ -49,7 +49,7 @@ public class InheritTimeline: Timeline, BoneTimeline { public var boneIndex: Int32 { get { let result = spine_inherit_timeline_get_bone_index(_ptr.assumingMemoryBound(to: spine_inherit_timeline_wrapper.self)) - return result + return result } set { spine_inherit_timeline_set_bone_index(_ptr.assumingMemoryBound(to: spine_inherit_timeline_wrapper.self), newValue) @@ -61,11 +61,10 @@ public class InheritTimeline: Timeline, BoneTimeline { /// - Parameter frame: Between 0 and frameCount, inclusive. /// - Parameter time: The frame time in seconds. public func setFrame(_ frame: Int32, _ time: Float, _ inherit: Inherit) { - spine_inherit_timeline_set_frame( - _ptr.assumingMemoryBound(to: spine_inherit_timeline_wrapper.self), frame, time, spine_inherit(rawValue: UInt32(inherit.rawValue))) + spine_inherit_timeline_set_frame(_ptr.assumingMemoryBound(to: spine_inherit_timeline_wrapper.self), frame, time, spine_inherit(rawValue: UInt32(inherit.rawValue))) } public func dispose() { spine_inherit_timeline_dispose(_ptr.assumingMemoryBound(to: spine_inherit_timeline_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/linked_mesh.swift b/spine-ios/Sources/SpineSwift/Generated/linked_mesh.swift index db3e656da..c6cf7eff2 100644 --- a/spine-ios/Sources/SpineSwift/Generated/linked_mesh.swift +++ b/spine-ios/Sources/SpineSwift/Generated/linked_mesh.swift @@ -35,4 +35,4 @@ import SpineC /// LinkedMesh wrapper public protocol LinkedMesh { var _ptr: UnsafeMutableRawPointer { get } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/mesh_attachment.swift b/spine-ios/Sources/SpineSwift/Generated/mesh_attachment.swift index 91d1c8a81..5ab7da2ed 100644 --- a/spine-ios/Sources/SpineSwift/Generated/mesh_attachment.swift +++ b/spine-ios/Sources/SpineSwift/Generated/mesh_attachment.swift @@ -41,49 +41,53 @@ public class MeshAttachment: VertexAttachment { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_vertex_attachment_wrapper.self)) } - public convenience init(_ name: String) { - let ptr = spine_mesh_attachment_create(name) + public convenience init(_ name: String, _ sequence: Sequence?) { + let ptr = spine_mesh_attachment_create(name, sequence?._ptr.assumingMemoryBound(to: spine_sequence_wrapper.self)) self.init(fromPointer: ptr!) } + public var regionUVs: ArrayFloat { + get { + let result = spine_mesh_attachment_get_region_u_vs(_ptr.assumingMemoryBound(to: spine_mesh_attachment_wrapper.self)) + return ArrayFloat(fromPointer: result!) + } + set { + spine_mesh_attachment_set_region_u_vs(_ptr.assumingMemoryBound(to: spine_mesh_attachment_wrapper.self), newValue._ptr.assumingMemoryBound(to: spine_array_float_wrapper.self)) + } + } + + public var triangles: ArrayUnsignedShort { + get { + let result = spine_mesh_attachment_get_triangles(_ptr.assumingMemoryBound(to: spine_mesh_attachment_wrapper.self)) + return ArrayUnsignedShort(fromPointer: result!) + } + set { + spine_mesh_attachment_set_triangles(_ptr.assumingMemoryBound(to: spine_mesh_attachment_wrapper.self), newValue._ptr.assumingMemoryBound(to: spine_array_unsigned_short_wrapper.self)) + } + } + public var hullLength: Int32 { get { let result = spine_mesh_attachment_get_hull_length(_ptr.assumingMemoryBound(to: spine_mesh_attachment_wrapper.self)) - return result + return result } set { spine_mesh_attachment_set_hull_length(_ptr.assumingMemoryBound(to: spine_mesh_attachment_wrapper.self), newValue) } } - public var regionUVs: ArrayFloat { - get { - let result = spine_mesh_attachment_get_region_u_vs(_ptr.assumingMemoryBound(to: spine_mesh_attachment_wrapper.self)) - return ArrayFloat(fromPointer: result!) - } - set { - spine_mesh_attachment_set_region_u_vs( - _ptr.assumingMemoryBound(to: spine_mesh_attachment_wrapper.self), - newValue._ptr.assumingMemoryBound(to: spine_array_float_wrapper.self)) - } + public var sequence: Sequence { + let result = spine_mesh_attachment_get_sequence(_ptr.assumingMemoryBound(to: spine_mesh_attachment_wrapper.self)) + return Sequence(fromPointer: result!) } - /// The UV pair for each vertex, normalized within the entire texture. See also - /// MeshAttachment::updateRegion - public var uVs: ArrayFloat { - let result = spine_mesh_attachment_get_u_vs(_ptr.assumingMemoryBound(to: spine_mesh_attachment_wrapper.self)) - return ArrayFloat(fromPointer: result!) - } - - public var triangles: ArrayUnsignedShort { + public var path: String { get { - let result = spine_mesh_attachment_get_triangles(_ptr.assumingMemoryBound(to: spine_mesh_attachment_wrapper.self)) - return ArrayUnsignedShort(fromPointer: result!) + let result = spine_mesh_attachment_get_path(_ptr.assumingMemoryBound(to: spine_mesh_attachment_wrapper.self)) + return String(cString: result!) } set { - spine_mesh_attachment_set_triangles( - _ptr.assumingMemoryBound(to: spine_mesh_attachment_wrapper.self), - newValue._ptr.assumingMemoryBound(to: spine_array_unsigned_short_wrapper.self)) + spine_mesh_attachment_set_path(_ptr.assumingMemoryBound(to: spine_mesh_attachment_wrapper.self), newValue) } } @@ -92,68 +96,30 @@ public class MeshAttachment: VertexAttachment { return Color(fromPointer: result!) } - public var path: String { - get { - let result = spine_mesh_attachment_get_path(_ptr.assumingMemoryBound(to: spine_mesh_attachment_wrapper.self)) - return String(cString: result!) - } - set { - spine_mesh_attachment_set_path(_ptr.assumingMemoryBound(to: spine_mesh_attachment_wrapper.self), newValue) - } - } - - public var region: TextureRegion? { - get { - let result = spine_mesh_attachment_get_region(_ptr.assumingMemoryBound(to: spine_mesh_attachment_wrapper.self)) - return result.map { TextureRegion(fromPointer: $0) } - } - set { - spine_mesh_attachment_set_region( - _ptr.assumingMemoryBound(to: spine_mesh_attachment_wrapper.self), - newValue?._ptr.assumingMemoryBound(to: spine_texture_region_wrapper.self)) - } - } - - public var sequence: Sequence? { - get { - let result = spine_mesh_attachment_get_sequence(_ptr.assumingMemoryBound(to: spine_mesh_attachment_wrapper.self)) - return result.map { Sequence(fromPointer: $0) } - } - set { - spine_mesh_attachment_set_sequence( - _ptr.assumingMemoryBound(to: spine_mesh_attachment_wrapper.self), newValue?._ptr.assumingMemoryBound(to: spine_sequence_wrapper.self)) - } - } - public var parentMesh: MeshAttachment? { get { let result = spine_mesh_attachment_get_parent_mesh(_ptr.assumingMemoryBound(to: spine_mesh_attachment_wrapper.self)) - return result.map { MeshAttachment(fromPointer: $0) } + return result.map { MeshAttachment(fromPointer: $0) } } set { - spine_mesh_attachment_set_parent_mesh( - _ptr.assumingMemoryBound(to: spine_mesh_attachment_wrapper.self), - newValue?._ptr.assumingMemoryBound(to: spine_mesh_attachment_wrapper.self)) + spine_mesh_attachment_set_parent_mesh(_ptr.assumingMemoryBound(to: spine_mesh_attachment_wrapper.self), newValue?._ptr.assumingMemoryBound(to: spine_mesh_attachment_wrapper.self)) } } - /// Nonessential. public var edges: ArrayUnsignedShort { get { let result = spine_mesh_attachment_get_edges(_ptr.assumingMemoryBound(to: spine_mesh_attachment_wrapper.self)) - return ArrayUnsignedShort(fromPointer: result!) + return ArrayUnsignedShort(fromPointer: result!) } set { - spine_mesh_attachment_set_edges( - _ptr.assumingMemoryBound(to: spine_mesh_attachment_wrapper.self), - newValue._ptr.assumingMemoryBound(to: spine_array_unsigned_short_wrapper.self)) + spine_mesh_attachment_set_edges(_ptr.assumingMemoryBound(to: spine_mesh_attachment_wrapper.self), newValue._ptr.assumingMemoryBound(to: spine_array_unsigned_short_wrapper.self)) } } public var width: Float { get { let result = spine_mesh_attachment_get_width(_ptr.assumingMemoryBound(to: spine_mesh_attachment_wrapper.self)) - return result + return result } set { spine_mesh_attachment_set_width(_ptr.assumingMemoryBound(to: spine_mesh_attachment_wrapper.self), newValue) @@ -163,15 +129,15 @@ public class MeshAttachment: VertexAttachment { public var height: Float { get { let result = spine_mesh_attachment_get_height(_ptr.assumingMemoryBound(to: spine_mesh_attachment_wrapper.self)) - return result + return result } set { spine_mesh_attachment_set_height(_ptr.assumingMemoryBound(to: spine_mesh_attachment_wrapper.self), newValue) } } - public func updateRegion() { - spine_mesh_attachment_update_region(_ptr.assumingMemoryBound(to: spine_mesh_attachment_wrapper.self)) + public func updateSequence() { + spine_mesh_attachment_update_sequence(_ptr.assumingMemoryBound(to: spine_mesh_attachment_wrapper.self)) } public func newLinkedMesh() -> MeshAttachment { @@ -179,7 +145,14 @@ public class MeshAttachment: VertexAttachment { return MeshAttachment(fromPointer: result!) } + /// Computes UVs for a mesh attachment. + /// + /// - Parameter uvs: Output array for the computed UVs, same length as regionUVs. + public static func computeUVs(_ region: TextureRegion?, _ regionUVs: ArrayFloat, _ uvs: ArrayFloat) { + spine_mesh_attachment_compute_u_vs(region?._ptr.assumingMemoryBound(to: spine_texture_region_wrapper.self), regionUVs._ptr.assumingMemoryBound(to: spine_array_float_wrapper.self), uvs._ptr.assumingMemoryBound(to: spine_array_float_wrapper.self)) + } + public func dispose() { spine_mesh_attachment_dispose(_ptr.assumingMemoryBound(to: spine_mesh_attachment_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/mix_blend.swift b/spine-ios/Sources/SpineSwift/Generated/mix_blend.swift index f45e5c2f6..582dd9718 100644 --- a/spine-ios/Sources/SpineSwift/Generated/mix_blend.swift +++ b/spine-ios/Sources/SpineSwift/Generated/mix_blend.swift @@ -41,4 +41,4 @@ public enum MixBlend: Int32, CaseIterable { public static func fromValue(_ value: Int32) -> MixBlend? { return MixBlend(rawValue: value) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/mix_direction.swift b/spine-ios/Sources/SpineSwift/Generated/mix_direction.swift index ef271a6b6..9ca621d28 100644 --- a/spine-ios/Sources/SpineSwift/Generated/mix_direction.swift +++ b/spine-ios/Sources/SpineSwift/Generated/mix_direction.swift @@ -39,4 +39,4 @@ public enum MixDirection: Int32, CaseIterable { public static func fromValue(_ value: Int32) -> MixDirection? { return MixDirection(rawValue: value) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/path_attachment.swift b/spine-ios/Sources/SpineSwift/Generated/path_attachment.swift index aecc4f35e..f59a871f8 100644 --- a/spine-ios/Sources/SpineSwift/Generated/path_attachment.swift +++ b/spine-ios/Sources/SpineSwift/Generated/path_attachment.swift @@ -50,19 +50,17 @@ public class PathAttachment: VertexAttachment { public var lengths: ArrayFloat { get { let result = spine_path_attachment_get_lengths(_ptr.assumingMemoryBound(to: spine_path_attachment_wrapper.self)) - return ArrayFloat(fromPointer: result!) + return ArrayFloat(fromPointer: result!) } set { - spine_path_attachment_set_lengths( - _ptr.assumingMemoryBound(to: spine_path_attachment_wrapper.self), - newValue._ptr.assumingMemoryBound(to: spine_array_float_wrapper.self)) + spine_path_attachment_set_lengths(_ptr.assumingMemoryBound(to: spine_path_attachment_wrapper.self), newValue._ptr.assumingMemoryBound(to: spine_array_float_wrapper.self)) } } public var closed: Bool { get { let result = spine_path_attachment_get_closed(_ptr.assumingMemoryBound(to: spine_path_attachment_wrapper.self)) - return result + return result } set { spine_path_attachment_set_closed(_ptr.assumingMemoryBound(to: spine_path_attachment_wrapper.self), newValue) @@ -72,7 +70,7 @@ public class PathAttachment: VertexAttachment { public var constantSpeed: Bool { get { let result = spine_path_attachment_get_constant_speed(_ptr.assumingMemoryBound(to: spine_path_attachment_wrapper.self)) - return result + return result } set { spine_path_attachment_set_constant_speed(_ptr.assumingMemoryBound(to: spine_path_attachment_wrapper.self), newValue) @@ -87,4 +85,4 @@ public class PathAttachment: VertexAttachment { public func dispose() { spine_path_attachment_dispose(_ptr.assumingMemoryBound(to: spine_path_attachment_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/path_constraint.swift b/spine-ios/Sources/SpineSwift/Generated/path_constraint.swift index 89f0e337d..60ed3304f 100644 --- a/spine-ios/Sources/SpineSwift/Generated/path_constraint.swift +++ b/spine-ios/Sources/SpineSwift/Generated/path_constraint.swift @@ -42,9 +42,7 @@ public class PathConstraint: PathConstraintBase { } public convenience init(_ data: PathConstraintData, _ skeleton: Skeleton) { - let ptr = spine_path_constraint_create( - data._ptr.assumingMemoryBound(to: spine_path_constraint_data_wrapper.self), - skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) + let ptr = spine_path_constraint_create(data._ptr.assumingMemoryBound(to: spine_path_constraint_data_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) self.init(fromPointer: ptr!) } @@ -58,21 +56,19 @@ public class PathConstraint: PathConstraintBase { public var slot: Slot { get { let result = spine_path_constraint_get_slot(_ptr.assumingMemoryBound(to: spine_path_constraint_wrapper.self)) - return Slot(fromPointer: result!) + return Slot(fromPointer: result!) } set { - spine_path_constraint_set_slot( - _ptr.assumingMemoryBound(to: spine_path_constraint_wrapper.self), newValue._ptr.assumingMemoryBound(to: spine_slot_wrapper.self)) + spine_path_constraint_set_slot(_ptr.assumingMemoryBound(to: spine_path_constraint_wrapper.self), newValue._ptr.assumingMemoryBound(to: spine_slot_wrapper.self)) } } public func copyAttachment(_ skeleton: Skeleton) -> PathConstraint { - let result = spine_path_constraint_copy( - _ptr.assumingMemoryBound(to: spine_path_constraint_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) + let result = spine_path_constraint_copy(_ptr.assumingMemoryBound(to: spine_path_constraint_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) return PathConstraint(fromPointer: result!) } public override func dispose() { spine_path_constraint_dispose(_ptr.assumingMemoryBound(to: spine_path_constraint_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/path_constraint_base.swift b/spine-ios/Sources/SpineSwift/Generated/path_constraint_base.swift index c7caf0cf1..8e9ee7916 100644 --- a/spine-ios/Sources/SpineSwift/Generated/path_constraint_base.swift +++ b/spine-ios/Sources/SpineSwift/Generated/path_constraint_base.swift @@ -84,15 +84,12 @@ open class PathConstraintBase: PosedActive, Posed, Constraint { } public func sort(_ skeleton: Skeleton) { - spine_path_constraint_base_sort( - _ptr.assumingMemoryBound(to: spine_path_constraint_base_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) + spine_path_constraint_base_sort(_ptr.assumingMemoryBound(to: spine_path_constraint_base_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) } /// Inherited from Update public func update(_ skeleton: Skeleton, _ physics: Physics) { - spine_path_constraint_base_update( - _ptr.assumingMemoryBound(to: spine_path_constraint_base_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self), - spine_physics(rawValue: UInt32(physics.rawValue))) + spine_path_constraint_base_update(_ptr.assumingMemoryBound(to: spine_path_constraint_base_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self), spine_physics(rawValue: UInt32(physics.rawValue))) } public static func rttiStatic() -> Rtti { @@ -100,4 +97,4 @@ open class PathConstraintBase: PosedActive, Posed, Constraint { return Rtti(fromPointer: result!) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/path_constraint_data.swift b/spine-ios/Sources/SpineSwift/Generated/path_constraint_data.swift index 0a36c8c4c..13d5b5806 100644 --- a/spine-ios/Sources/SpineSwift/Generated/path_constraint_data.swift +++ b/spine-ios/Sources/SpineSwift/Generated/path_constraint_data.swift @@ -64,12 +64,10 @@ public class PathConstraintData: PosedData, ConstraintData { public var slot: SlotData { get { let result = spine_path_constraint_data_get_slot(_ptr.assumingMemoryBound(to: spine_path_constraint_data_wrapper.self)) - return SlotData(fromPointer: result!) + return SlotData(fromPointer: result!) } set { - spine_path_constraint_data_set_slot( - _ptr.assumingMemoryBound(to: spine_path_constraint_data_wrapper.self), - newValue._ptr.assumingMemoryBound(to: spine_slot_data_wrapper.self)) + spine_path_constraint_data_set_slot(_ptr.assumingMemoryBound(to: spine_path_constraint_data_wrapper.self), newValue._ptr.assumingMemoryBound(to: spine_slot_data_wrapper.self)) } } @@ -77,11 +75,10 @@ public class PathConstraintData: PosedData, ConstraintData { public var positionMode: PositionMode { get { let result = spine_path_constraint_data_get_position_mode(_ptr.assumingMemoryBound(to: spine_path_constraint_data_wrapper.self)) - return PositionMode(rawValue: Int32(result.rawValue))! + return PositionMode(rawValue: Int32(result.rawValue))! } set { - spine_path_constraint_data_set_position_mode( - _ptr.assumingMemoryBound(to: spine_path_constraint_data_wrapper.self), spine_position_mode(rawValue: UInt32(newValue.rawValue))) + spine_path_constraint_data_set_position_mode(_ptr.assumingMemoryBound(to: spine_path_constraint_data_wrapper.self), spine_position_mode(rawValue: UInt32(newValue.rawValue))) } } @@ -89,11 +86,10 @@ public class PathConstraintData: PosedData, ConstraintData { public var spacingMode: SpacingMode { get { let result = spine_path_constraint_data_get_spacing_mode(_ptr.assumingMemoryBound(to: spine_path_constraint_data_wrapper.self)) - return SpacingMode(rawValue: Int32(result.rawValue))! + return SpacingMode(rawValue: Int32(result.rawValue))! } set { - spine_path_constraint_data_set_spacing_mode( - _ptr.assumingMemoryBound(to: spine_path_constraint_data_wrapper.self), spine_spacing_mode(rawValue: UInt32(newValue.rawValue))) + spine_path_constraint_data_set_spacing_mode(_ptr.assumingMemoryBound(to: spine_path_constraint_data_wrapper.self), spine_spacing_mode(rawValue: UInt32(newValue.rawValue))) } } @@ -101,11 +97,10 @@ public class PathConstraintData: PosedData, ConstraintData { public var rotateMode: RotateMode { get { let result = spine_path_constraint_data_get_rotate_mode(_ptr.assumingMemoryBound(to: spine_path_constraint_data_wrapper.self)) - return RotateMode(rawValue: Int32(result.rawValue))! + return RotateMode(rawValue: Int32(result.rawValue))! } set { - spine_path_constraint_data_set_rotate_mode( - _ptr.assumingMemoryBound(to: spine_path_constraint_data_wrapper.self), spine_rotate_mode(rawValue: UInt32(newValue.rawValue))) + spine_path_constraint_data_set_rotate_mode(_ptr.assumingMemoryBound(to: spine_path_constraint_data_wrapper.self), spine_rotate_mode(rawValue: UInt32(newValue.rawValue))) } } @@ -113,7 +108,7 @@ public class PathConstraintData: PosedData, ConstraintData { public var offsetRotation: Float { get { let result = spine_path_constraint_data_get_offset_rotation(_ptr.assumingMemoryBound(to: spine_path_constraint_data_wrapper.self)) - return result + return result } set { spine_path_constraint_data_set_offset_rotation(_ptr.assumingMemoryBound(to: spine_path_constraint_data_wrapper.self), newValue) @@ -126,8 +121,7 @@ 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 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 rttiClassName = String(cString: spine_rtti_get_class_name(rtti)!) switch rttiClassName { @@ -159,4 +153,4 @@ public class PathConstraintData: PosedData, ConstraintData { public override func dispose() { spine_path_constraint_data_dispose(_ptr.assumingMemoryBound(to: spine_path_constraint_data_wrapper.self)) } -} +} \ No newline at end of file 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 ca77c51db..010c7f33f 100644 --- a/spine-ios/Sources/SpineSwift/Generated/path_constraint_mix_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/path_constraint_mix_timeline.swift @@ -49,13 +49,11 @@ public class PathConstraintMixTimeline: CurveTimeline, ConstraintTimeline { public var constraintIndex: Int32 { get { - let result = spine_path_constraint_mix_timeline_get_constraint_index( - _ptr.assumingMemoryBound(to: spine_path_constraint_mix_timeline_wrapper.self)) - return result + let result = spine_path_constraint_mix_timeline_get_constraint_index(_ptr.assumingMemoryBound(to: spine_path_constraint_mix_timeline_wrapper.self)) + return result } set { - spine_path_constraint_mix_timeline_set_constraint_index( - _ptr.assumingMemoryBound(to: spine_path_constraint_mix_timeline_wrapper.self), newValue) + spine_path_constraint_mix_timeline_set_constraint_index(_ptr.assumingMemoryBound(to: spine_path_constraint_mix_timeline_wrapper.self), newValue) } } @@ -64,11 +62,10 @@ public class PathConstraintMixTimeline: CurveTimeline, ConstraintTimeline { /// - Parameter frame: Between 0 and frameCount, inclusive. /// - Parameter time: The frame time in seconds. public func setFrame(_ frame: Int32, _ time: Float, _ mixRotate: Float, _ mixX: Float, _ mixY: Float) { - spine_path_constraint_mix_timeline_set_frame( - _ptr.assumingMemoryBound(to: spine_path_constraint_mix_timeline_wrapper.self), frame, time, mixRotate, mixX, mixY) + spine_path_constraint_mix_timeline_set_frame(_ptr.assumingMemoryBound(to: spine_path_constraint_mix_timeline_wrapper.self), frame, time, mixRotate, mixX, mixY) } public func dispose() { spine_path_constraint_mix_timeline_dispose(_ptr.assumingMemoryBound(to: spine_path_constraint_mix_timeline_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/path_constraint_pose.swift b/spine-ios/Sources/SpineSwift/Generated/path_constraint_pose.swift index 1687b7418..b0e599d3b 100644 --- a/spine-ios/Sources/SpineSwift/Generated/path_constraint_pose.swift +++ b/spine-ios/Sources/SpineSwift/Generated/path_constraint_pose.swift @@ -52,7 +52,7 @@ public class PathConstraintPose: NSObject { public var position: Float { get { let result = spine_path_constraint_pose_get_position(_ptr.assumingMemoryBound(to: spine_path_constraint_pose_wrapper.self)) - return result + return result } set { spine_path_constraint_pose_set_position(_ptr.assumingMemoryBound(to: spine_path_constraint_pose_wrapper.self), newValue) @@ -63,7 +63,7 @@ public class PathConstraintPose: NSObject { public var spacing: Float { get { let result = spine_path_constraint_pose_get_spacing(_ptr.assumingMemoryBound(to: spine_path_constraint_pose_wrapper.self)) - return result + return result } set { spine_path_constraint_pose_set_spacing(_ptr.assumingMemoryBound(to: spine_path_constraint_pose_wrapper.self), newValue) @@ -74,7 +74,7 @@ public class PathConstraintPose: NSObject { public var mixRotate: Float { get { let result = spine_path_constraint_pose_get_mix_rotate(_ptr.assumingMemoryBound(to: spine_path_constraint_pose_wrapper.self)) - return result + return result } set { spine_path_constraint_pose_set_mix_rotate(_ptr.assumingMemoryBound(to: spine_path_constraint_pose_wrapper.self), newValue) @@ -86,7 +86,7 @@ public class PathConstraintPose: NSObject { public var mixX: Float { get { let result = spine_path_constraint_pose_get_mix_x(_ptr.assumingMemoryBound(to: spine_path_constraint_pose_wrapper.self)) - return result + return result } set { spine_path_constraint_pose_set_mix_x(_ptr.assumingMemoryBound(to: spine_path_constraint_pose_wrapper.self), newValue) @@ -98,7 +98,7 @@ public class PathConstraintPose: NSObject { public var mixY: Float { get { let result = spine_path_constraint_pose_get_mix_y(_ptr.assumingMemoryBound(to: spine_path_constraint_pose_wrapper.self)) - return result + return result } set { spine_path_constraint_pose_set_mix_y(_ptr.assumingMemoryBound(to: spine_path_constraint_pose_wrapper.self), newValue) @@ -106,12 +106,10 @@ public class PathConstraintPose: NSObject { } public func set(_ pose: PathConstraintPose) { - spine_path_constraint_pose_set( - _ptr.assumingMemoryBound(to: spine_path_constraint_pose_wrapper.self), - pose._ptr.assumingMemoryBound(to: spine_path_constraint_pose_wrapper.self)) + spine_path_constraint_pose_set(_ptr.assumingMemoryBound(to: spine_path_constraint_pose_wrapper.self), pose._ptr.assumingMemoryBound(to: spine_path_constraint_pose_wrapper.self)) } public func dispose() { spine_path_constraint_pose_dispose(_ptr.assumingMemoryBound(to: spine_path_constraint_pose_wrapper.self)) } -} +} \ No newline at end of file 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 d382df744..ddab59d11 100644 --- a/spine-ios/Sources/SpineSwift/Generated/path_constraint_position_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/path_constraint_position_timeline.swift @@ -49,4 +49,4 @@ public class PathConstraintPositionTimeline: ConstraintTimeline1 { public func dispose() { spine_path_constraint_position_timeline_dispose(_ptr.assumingMemoryBound(to: spine_path_constraint_position_timeline_wrapper.self)) } -} +} \ No newline at end of file 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 47067451c..31d080211 100644 --- a/spine-ios/Sources/SpineSwift/Generated/path_constraint_spacing_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/path_constraint_spacing_timeline.swift @@ -49,4 +49,4 @@ public class PathConstraintSpacingTimeline: ConstraintTimeline1 { public func dispose() { spine_path_constraint_spacing_timeline_dispose(_ptr.assumingMemoryBound(to: spine_path_constraint_spacing_timeline_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/physics.swift b/spine-ios/Sources/SpineSwift/Generated/physics.swift index eed202790..eef1ca631 100644 --- a/spine-ios/Sources/SpineSwift/Generated/physics.swift +++ b/spine-ios/Sources/SpineSwift/Generated/physics.swift @@ -41,4 +41,4 @@ public enum Physics: Int32, CaseIterable { public static func fromValue(_ value: Int32) -> Physics? { return Physics(rawValue: value) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/physics_constraint.swift b/spine-ios/Sources/SpineSwift/Generated/physics_constraint.swift index b99c46516..5fda3c4e3 100644 --- a/spine-ios/Sources/SpineSwift/Generated/physics_constraint.swift +++ b/spine-ios/Sources/SpineSwift/Generated/physics_constraint.swift @@ -42,9 +42,7 @@ public class PhysicsConstraint: PhysicsConstraintBase { } public convenience init(_ data: PhysicsConstraintData, _ skeleton: Skeleton) { - let ptr = spine_physics_constraint_create( - data._ptr.assumingMemoryBound(to: spine_physics_constraint_data_wrapper.self), - skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) + let ptr = spine_physics_constraint_create(data._ptr.assumingMemoryBound(to: spine_physics_constraint_data_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) self.init(fromPointer: ptr!) } @@ -52,24 +50,20 @@ public class PhysicsConstraint: PhysicsConstraintBase { public var bone: BonePose { get { let result = spine_physics_constraint_get_bone(_ptr.assumingMemoryBound(to: spine_physics_constraint_wrapper.self)) - return BonePose(fromPointer: result!) + return BonePose(fromPointer: result!) } set { - spine_physics_constraint_set_bone( - _ptr.assumingMemoryBound(to: spine_physics_constraint_wrapper.self), - newValue._ptr.assumingMemoryBound(to: spine_bone_pose_wrapper.self)) + spine_physics_constraint_set_bone(_ptr.assumingMemoryBound(to: spine_physics_constraint_wrapper.self), newValue._ptr.assumingMemoryBound(to: spine_bone_pose_wrapper.self)) } } public func copyAttachment(_ skeleton: Skeleton) -> PhysicsConstraint { - let result = spine_physics_constraint_copy( - _ptr.assumingMemoryBound(to: spine_physics_constraint_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) + let result = spine_physics_constraint_copy(_ptr.assumingMemoryBound(to: spine_physics_constraint_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) return PhysicsConstraint(fromPointer: result!) } public func reset(_ skeleton: Skeleton) { - spine_physics_constraint_reset( - _ptr.assumingMemoryBound(to: spine_physics_constraint_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) + spine_physics_constraint_reset(_ptr.assumingMemoryBound(to: spine_physics_constraint_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) } /// Translates the physics constraint so next update() forces are applied as if the bone moved @@ -87,4 +81,4 @@ public class PhysicsConstraint: PhysicsConstraintBase { public override func dispose() { spine_physics_constraint_dispose(_ptr.assumingMemoryBound(to: spine_physics_constraint_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/physics_constraint_base.swift b/spine-ios/Sources/SpineSwift/Generated/physics_constraint_base.swift index 7db3a0119..0512d8f97 100644 --- a/spine-ios/Sources/SpineSwift/Generated/physics_constraint_base.swift +++ b/spine-ios/Sources/SpineSwift/Generated/physics_constraint_base.swift @@ -83,16 +83,12 @@ open class PhysicsConstraintBase: PosedActive, Posed, Constraint { } public func sort(_ skeleton: Skeleton) { - spine_physics_constraint_base_sort( - _ptr.assumingMemoryBound(to: spine_physics_constraint_base_wrapper.self), - skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) + spine_physics_constraint_base_sort(_ptr.assumingMemoryBound(to: spine_physics_constraint_base_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) } /// Inherited from Update public func update(_ skeleton: Skeleton, _ physics: Physics) { - spine_physics_constraint_base_update( - _ptr.assumingMemoryBound(to: spine_physics_constraint_base_wrapper.self), - skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self), spine_physics(rawValue: UInt32(physics.rawValue))) + spine_physics_constraint_base_update(_ptr.assumingMemoryBound(to: spine_physics_constraint_base_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self), spine_physics(rawValue: UInt32(physics.rawValue))) } public static func rttiStatic() -> Rtti { @@ -100,4 +96,4 @@ open class PhysicsConstraintBase: PosedActive, Posed, Constraint { return Rtti(fromPointer: result!) } -} +} \ No newline at end of file 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 a3d6385f4..39bf030de 100644 --- a/spine-ios/Sources/SpineSwift/Generated/physics_constraint_damping_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/physics_constraint_damping_timeline.swift @@ -49,4 +49,4 @@ public class PhysicsConstraintDampingTimeline: PhysicsConstraintTimeline { public func dispose() { spine_physics_constraint_damping_timeline_dispose(_ptr.assumingMemoryBound(to: spine_physics_constraint_damping_timeline_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/physics_constraint_data.swift b/spine-ios/Sources/SpineSwift/Generated/physics_constraint_data.swift index 3e224cde4..6e8f7a73e 100644 --- a/spine-ios/Sources/SpineSwift/Generated/physics_constraint_data.swift +++ b/spine-ios/Sources/SpineSwift/Generated/physics_constraint_data.swift @@ -58,19 +58,17 @@ public class PhysicsConstraintData: PosedData, ConstraintData { public var bone: BoneData { get { let result = spine_physics_constraint_data_get_bone(_ptr.assumingMemoryBound(to: spine_physics_constraint_data_wrapper.self)) - return BoneData(fromPointer: result!) + return BoneData(fromPointer: result!) } set { - spine_physics_constraint_data_set_bone( - _ptr.assumingMemoryBound(to: spine_physics_constraint_data_wrapper.self), - newValue._ptr.assumingMemoryBound(to: spine_bone_data_wrapper.self)) + spine_physics_constraint_data_set_bone(_ptr.assumingMemoryBound(to: spine_physics_constraint_data_wrapper.self), newValue._ptr.assumingMemoryBound(to: spine_bone_data_wrapper.self)) } } public var step: Float { get { let result = spine_physics_constraint_data_get_step(_ptr.assumingMemoryBound(to: spine_physics_constraint_data_wrapper.self)) - return result + return result } set { spine_physics_constraint_data_set_step(_ptr.assumingMemoryBound(to: spine_physics_constraint_data_wrapper.self), newValue) @@ -80,7 +78,7 @@ public class PhysicsConstraintData: PosedData, ConstraintData { public var x: Float { get { let result = spine_physics_constraint_data_get_x(_ptr.assumingMemoryBound(to: spine_physics_constraint_data_wrapper.self)) - return result + return result } set { spine_physics_constraint_data_set_x(_ptr.assumingMemoryBound(to: spine_physics_constraint_data_wrapper.self), newValue) @@ -90,7 +88,7 @@ public class PhysicsConstraintData: PosedData, ConstraintData { public var y: Float { get { let result = spine_physics_constraint_data_get_y(_ptr.assumingMemoryBound(to: spine_physics_constraint_data_wrapper.self)) - return result + return result } set { spine_physics_constraint_data_set_y(_ptr.assumingMemoryBound(to: spine_physics_constraint_data_wrapper.self), newValue) @@ -100,7 +98,7 @@ public class PhysicsConstraintData: PosedData, ConstraintData { public var rotate: Float { get { let result = spine_physics_constraint_data_get_rotate(_ptr.assumingMemoryBound(to: spine_physics_constraint_data_wrapper.self)) - return result + return result } set { spine_physics_constraint_data_set_rotate(_ptr.assumingMemoryBound(to: spine_physics_constraint_data_wrapper.self), newValue) @@ -110,7 +108,7 @@ public class PhysicsConstraintData: PosedData, ConstraintData { public var scaleX: Float { get { let result = spine_physics_constraint_data_get_scale_x(_ptr.assumingMemoryBound(to: spine_physics_constraint_data_wrapper.self)) - return result + return result } set { spine_physics_constraint_data_set_scale_x(_ptr.assumingMemoryBound(to: spine_physics_constraint_data_wrapper.self), newValue) @@ -120,7 +118,7 @@ public class PhysicsConstraintData: PosedData, ConstraintData { public var shearX: Float { get { let result = spine_physics_constraint_data_get_shear_x(_ptr.assumingMemoryBound(to: spine_physics_constraint_data_wrapper.self)) - return result + return result } set { spine_physics_constraint_data_set_shear_x(_ptr.assumingMemoryBound(to: spine_physics_constraint_data_wrapper.self), newValue) @@ -130,7 +128,7 @@ public class PhysicsConstraintData: PosedData, ConstraintData { public var limit: Float { get { let result = spine_physics_constraint_data_get_limit(_ptr.assumingMemoryBound(to: spine_physics_constraint_data_wrapper.self)) - return result + return result } set { spine_physics_constraint_data_set_limit(_ptr.assumingMemoryBound(to: spine_physics_constraint_data_wrapper.self), newValue) @@ -140,7 +138,7 @@ public class PhysicsConstraintData: PosedData, ConstraintData { public var inertiaGlobal: Bool { get { let result = spine_physics_constraint_data_get_inertia_global(_ptr.assumingMemoryBound(to: spine_physics_constraint_data_wrapper.self)) - return result + return result } set { spine_physics_constraint_data_set_inertia_global(_ptr.assumingMemoryBound(to: spine_physics_constraint_data_wrapper.self), newValue) @@ -150,7 +148,7 @@ public class PhysicsConstraintData: PosedData, ConstraintData { public var strengthGlobal: Bool { get { let result = spine_physics_constraint_data_get_strength_global(_ptr.assumingMemoryBound(to: spine_physics_constraint_data_wrapper.self)) - return result + return result } set { spine_physics_constraint_data_set_strength_global(_ptr.assumingMemoryBound(to: spine_physics_constraint_data_wrapper.self), newValue) @@ -160,7 +158,7 @@ public class PhysicsConstraintData: PosedData, ConstraintData { public var dampingGlobal: Bool { get { let result = spine_physics_constraint_data_get_damping_global(_ptr.assumingMemoryBound(to: spine_physics_constraint_data_wrapper.self)) - return result + return result } set { spine_physics_constraint_data_set_damping_global(_ptr.assumingMemoryBound(to: spine_physics_constraint_data_wrapper.self), newValue) @@ -170,7 +168,7 @@ public class PhysicsConstraintData: PosedData, ConstraintData { public var massGlobal: Bool { get { let result = spine_physics_constraint_data_get_mass_global(_ptr.assumingMemoryBound(to: spine_physics_constraint_data_wrapper.self)) - return result + return result } set { spine_physics_constraint_data_set_mass_global(_ptr.assumingMemoryBound(to: spine_physics_constraint_data_wrapper.self), newValue) @@ -180,7 +178,7 @@ public class PhysicsConstraintData: PosedData, ConstraintData { public var windGlobal: Bool { get { let result = spine_physics_constraint_data_get_wind_global(_ptr.assumingMemoryBound(to: spine_physics_constraint_data_wrapper.self)) - return result + return result } set { spine_physics_constraint_data_set_wind_global(_ptr.assumingMemoryBound(to: spine_physics_constraint_data_wrapper.self), newValue) @@ -190,7 +188,7 @@ public class PhysicsConstraintData: PosedData, ConstraintData { public var gravityGlobal: Bool { get { let result = spine_physics_constraint_data_get_gravity_global(_ptr.assumingMemoryBound(to: spine_physics_constraint_data_wrapper.self)) - return result + return result } set { spine_physics_constraint_data_set_gravity_global(_ptr.assumingMemoryBound(to: spine_physics_constraint_data_wrapper.self), newValue) @@ -200,7 +198,7 @@ public class PhysicsConstraintData: PosedData, ConstraintData { public var mixGlobal: Bool { get { let result = spine_physics_constraint_data_get_mix_global(_ptr.assumingMemoryBound(to: spine_physics_constraint_data_wrapper.self)) - return result + return result } set { spine_physics_constraint_data_set_mix_global(_ptr.assumingMemoryBound(to: spine_physics_constraint_data_wrapper.self), newValue) @@ -213,9 +211,7 @@ 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 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 rttiClassName = String(cString: spine_rtti_get_class_name(rtti)!) switch rttiClassName { @@ -247,4 +243,4 @@ public class PhysicsConstraintData: PosedData, ConstraintData { public override func dispose() { spine_physics_constraint_data_dispose(_ptr.assumingMemoryBound(to: spine_physics_constraint_data_wrapper.self)) } -} +} \ No newline at end of file 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 d4cdfdf49..4c8740aea 100644 --- a/spine-ios/Sources/SpineSwift/Generated/physics_constraint_gravity_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/physics_constraint_gravity_timeline.swift @@ -49,4 +49,4 @@ public class PhysicsConstraintGravityTimeline: PhysicsConstraintTimeline { public func dispose() { spine_physics_constraint_gravity_timeline_dispose(_ptr.assumingMemoryBound(to: spine_physics_constraint_gravity_timeline_wrapper.self)) } -} +} \ No newline at end of file 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 8fbaf0955..180e73af7 100644 --- a/spine-ios/Sources/SpineSwift/Generated/physics_constraint_inertia_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/physics_constraint_inertia_timeline.swift @@ -49,4 +49,4 @@ public class PhysicsConstraintInertiaTimeline: PhysicsConstraintTimeline { public func dispose() { spine_physics_constraint_inertia_timeline_dispose(_ptr.assumingMemoryBound(to: spine_physics_constraint_inertia_timeline_wrapper.self)) } -} +} \ No newline at end of file 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 7c228d476..9ccfb3cac 100644 --- a/spine-ios/Sources/SpineSwift/Generated/physics_constraint_mass_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/physics_constraint_mass_timeline.swift @@ -50,4 +50,4 @@ public class PhysicsConstraintMassTimeline: PhysicsConstraintTimeline { public func dispose() { spine_physics_constraint_mass_timeline_dispose(_ptr.assumingMemoryBound(to: spine_physics_constraint_mass_timeline_wrapper.self)) } -} +} \ No newline at end of file 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 cfa8a4e70..5aff3fed2 100644 --- a/spine-ios/Sources/SpineSwift/Generated/physics_constraint_mix_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/physics_constraint_mix_timeline.swift @@ -49,4 +49,4 @@ public class PhysicsConstraintMixTimeline: PhysicsConstraintTimeline { public func dispose() { spine_physics_constraint_mix_timeline_dispose(_ptr.assumingMemoryBound(to: spine_physics_constraint_mix_timeline_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/physics_constraint_pose.swift b/spine-ios/Sources/SpineSwift/Generated/physics_constraint_pose.swift index 765b71d0f..8fca2c5e0 100644 --- a/spine-ios/Sources/SpineSwift/Generated/physics_constraint_pose.swift +++ b/spine-ios/Sources/SpineSwift/Generated/physics_constraint_pose.swift @@ -51,7 +51,7 @@ public class PhysicsConstraintPose: NSObject { public var inertia: Float { get { let result = spine_physics_constraint_pose_get_inertia(_ptr.assumingMemoryBound(to: spine_physics_constraint_pose_wrapper.self)) - return result + return result } set { spine_physics_constraint_pose_set_inertia(_ptr.assumingMemoryBound(to: spine_physics_constraint_pose_wrapper.self), newValue) @@ -61,7 +61,7 @@ public class PhysicsConstraintPose: NSObject { public var strength: Float { get { let result = spine_physics_constraint_pose_get_strength(_ptr.assumingMemoryBound(to: spine_physics_constraint_pose_wrapper.self)) - return result + return result } set { spine_physics_constraint_pose_set_strength(_ptr.assumingMemoryBound(to: spine_physics_constraint_pose_wrapper.self), newValue) @@ -71,7 +71,7 @@ public class PhysicsConstraintPose: NSObject { public var damping: Float { get { let result = spine_physics_constraint_pose_get_damping(_ptr.assumingMemoryBound(to: spine_physics_constraint_pose_wrapper.self)) - return result + return result } set { spine_physics_constraint_pose_set_damping(_ptr.assumingMemoryBound(to: spine_physics_constraint_pose_wrapper.self), newValue) @@ -81,7 +81,7 @@ public class PhysicsConstraintPose: NSObject { public var massInverse: Float { get { let result = spine_physics_constraint_pose_get_mass_inverse(_ptr.assumingMemoryBound(to: spine_physics_constraint_pose_wrapper.self)) - return result + return result } set { spine_physics_constraint_pose_set_mass_inverse(_ptr.assumingMemoryBound(to: spine_physics_constraint_pose_wrapper.self), newValue) @@ -91,7 +91,7 @@ public class PhysicsConstraintPose: NSObject { public var wind: Float { get { let result = spine_physics_constraint_pose_get_wind(_ptr.assumingMemoryBound(to: spine_physics_constraint_pose_wrapper.self)) - return result + return result } set { spine_physics_constraint_pose_set_wind(_ptr.assumingMemoryBound(to: spine_physics_constraint_pose_wrapper.self), newValue) @@ -101,7 +101,7 @@ public class PhysicsConstraintPose: NSObject { public var gravity: Float { get { let result = spine_physics_constraint_pose_get_gravity(_ptr.assumingMemoryBound(to: spine_physics_constraint_pose_wrapper.self)) - return result + return result } set { spine_physics_constraint_pose_set_gravity(_ptr.assumingMemoryBound(to: spine_physics_constraint_pose_wrapper.self), newValue) @@ -112,7 +112,7 @@ public class PhysicsConstraintPose: NSObject { public var mix: Float { get { let result = spine_physics_constraint_pose_get_mix(_ptr.assumingMemoryBound(to: spine_physics_constraint_pose_wrapper.self)) - return result + return result } set { spine_physics_constraint_pose_set_mix(_ptr.assumingMemoryBound(to: spine_physics_constraint_pose_wrapper.self), newValue) @@ -120,12 +120,10 @@ public class PhysicsConstraintPose: NSObject { } public func set(_ pose: PhysicsConstraintPose) { - spine_physics_constraint_pose_set( - _ptr.assumingMemoryBound(to: spine_physics_constraint_pose_wrapper.self), - pose._ptr.assumingMemoryBound(to: spine_physics_constraint_pose_wrapper.self)) + spine_physics_constraint_pose_set(_ptr.assumingMemoryBound(to: spine_physics_constraint_pose_wrapper.self), pose._ptr.assumingMemoryBound(to: spine_physics_constraint_pose_wrapper.self)) } public func dispose() { spine_physics_constraint_pose_dispose(_ptr.assumingMemoryBound(to: spine_physics_constraint_pose_wrapper.self)) } -} +} \ No newline at end of file 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 1a3c99413..e9631feea 100644 --- a/spine-ios/Sources/SpineSwift/Generated/physics_constraint_reset_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/physics_constraint_reset_timeline.swift @@ -49,23 +49,20 @@ public class PhysicsConstraintResetTimeline: Timeline, ConstraintTimeline { public var constraintIndex: Int32 { get { - let result = spine_physics_constraint_reset_timeline_get_constraint_index( - _ptr.assumingMemoryBound(to: spine_physics_constraint_reset_timeline_wrapper.self)) - return result + let result = spine_physics_constraint_reset_timeline_get_constraint_index(_ptr.assumingMemoryBound(to: spine_physics_constraint_reset_timeline_wrapper.self)) + return result } set { - spine_physics_constraint_reset_timeline_set_constraint_index( - _ptr.assumingMemoryBound(to: spine_physics_constraint_reset_timeline_wrapper.self), newValue) + spine_physics_constraint_reset_timeline_set_constraint_index(_ptr.assumingMemoryBound(to: spine_physics_constraint_reset_timeline_wrapper.self), newValue) } } /// Sets the time for the specified frame. public func setFrame(_ frame: Int32, _ time: Float) { - spine_physics_constraint_reset_timeline_set_frame( - _ptr.assumingMemoryBound(to: spine_physics_constraint_reset_timeline_wrapper.self), frame, time) + spine_physics_constraint_reset_timeline_set_frame(_ptr.assumingMemoryBound(to: spine_physics_constraint_reset_timeline_wrapper.self), frame, time) } public func dispose() { spine_physics_constraint_reset_timeline_dispose(_ptr.assumingMemoryBound(to: spine_physics_constraint_reset_timeline_wrapper.self)) } -} +} \ No newline at end of file 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 798381fe4..ea487ab11 100644 --- a/spine-ios/Sources/SpineSwift/Generated/physics_constraint_strength_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/physics_constraint_strength_timeline.swift @@ -49,4 +49,4 @@ public class PhysicsConstraintStrengthTimeline: PhysicsConstraintTimeline { public func dispose() { spine_physics_constraint_strength_timeline_dispose(_ptr.assumingMemoryBound(to: spine_physics_constraint_strength_timeline_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/physics_constraint_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/physics_constraint_timeline.swift index 3289c86f4..24ba84657 100644 --- a/spine-ios/Sources/SpineSwift/Generated/physics_constraint_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/physics_constraint_timeline.swift @@ -43,14 +43,12 @@ open class PhysicsConstraintTimeline: CurveTimeline1, ConstraintTimeline { public var constraintIndex: Int32 { get { - let result = spine_physics_constraint_timeline_get_constraint_index( - _ptr.assumingMemoryBound(to: spine_physics_constraint_timeline_wrapper.self)) - return result + let result = spine_physics_constraint_timeline_get_constraint_index(_ptr.assumingMemoryBound(to: spine_physics_constraint_timeline_wrapper.self)) + return result } set { - spine_physics_constraint_timeline_set_constraint_index( - _ptr.assumingMemoryBound(to: spine_physics_constraint_timeline_wrapper.self), newValue) + spine_physics_constraint_timeline_set_constraint_index(_ptr.assumingMemoryBound(to: spine_physics_constraint_timeline_wrapper.self), newValue) } } -} +} \ No newline at end of file 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 17f34a1af..14c10dfd0 100644 --- a/spine-ios/Sources/SpineSwift/Generated/physics_constraint_wind_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/physics_constraint_wind_timeline.swift @@ -49,4 +49,4 @@ public class PhysicsConstraintWindTimeline: PhysicsConstraintTimeline { public func dispose() { spine_physics_constraint_wind_timeline_dispose(_ptr.assumingMemoryBound(to: spine_physics_constraint_wind_timeline_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/point_attachment.swift b/spine-ios/Sources/SpineSwift/Generated/point_attachment.swift index cef22d683..12b51ba67 100644 --- a/spine-ios/Sources/SpineSwift/Generated/point_attachment.swift +++ b/spine-ios/Sources/SpineSwift/Generated/point_attachment.swift @@ -53,7 +53,7 @@ public class PointAttachment: Attachment { public var x: Float { get { let result = spine_point_attachment_get_x(_ptr.assumingMemoryBound(to: spine_point_attachment_wrapper.self)) - return result + return result } set { spine_point_attachment_set_x(_ptr.assumingMemoryBound(to: spine_point_attachment_wrapper.self), newValue) @@ -63,7 +63,7 @@ public class PointAttachment: Attachment { public var y: Float { get { let result = spine_point_attachment_get_y(_ptr.assumingMemoryBound(to: spine_point_attachment_wrapper.self)) - return result + return result } set { spine_point_attachment_set_y(_ptr.assumingMemoryBound(to: spine_point_attachment_wrapper.self), newValue) @@ -73,7 +73,7 @@ public class PointAttachment: Attachment { public var rotation: Float { get { let result = spine_point_attachment_get_rotation(_ptr.assumingMemoryBound(to: spine_point_attachment_wrapper.self)) - return result + return result } set { spine_point_attachment_set_rotation(_ptr.assumingMemoryBound(to: spine_point_attachment_wrapper.self), newValue) @@ -86,12 +86,11 @@ public class PointAttachment: Attachment { } public func computeWorldRotation(_ bone: BonePose) -> Float { - let result = spine_point_attachment_compute_world_rotation( - _ptr.assumingMemoryBound(to: spine_point_attachment_wrapper.self), bone._ptr.assumingMemoryBound(to: spine_bone_pose_wrapper.self)) + let result = spine_point_attachment_compute_world_rotation(_ptr.assumingMemoryBound(to: spine_point_attachment_wrapper.self), bone._ptr.assumingMemoryBound(to: spine_bone_pose_wrapper.self)) return result } public func dispose() { spine_point_attachment_dispose(_ptr.assumingMemoryBound(to: spine_point_attachment_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/posed_active.swift b/spine-ios/Sources/SpineSwift/Generated/posed_active.swift index 7e9fc06f3..ddf104547 100644 --- a/spine-ios/Sources/SpineSwift/Generated/posed_active.swift +++ b/spine-ios/Sources/SpineSwift/Generated/posed_active.swift @@ -58,4 +58,4 @@ open class PosedActive: NSObject { public func dispose() { spine_posed_active_dispose(_ptr.assumingMemoryBound(to: spine_posed_active_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/posed_data.swift b/spine-ios/Sources/SpineSwift/Generated/posed_data.swift index d1a1e08a9..a419e9938 100644 --- a/spine-ios/Sources/SpineSwift/Generated/posed_data.swift +++ b/spine-ios/Sources/SpineSwift/Generated/posed_data.swift @@ -62,7 +62,7 @@ public class PosedData: NSObject { public var skinRequired: Bool { get { let result = spine_posed_data_get_skin_required(_ptr.assumingMemoryBound(to: spine_posed_data_wrapper.self)) - return result + return result } set { spine_posed_data_set_skin_required(_ptr.assumingMemoryBound(to: spine_posed_data_wrapper.self), newValue) @@ -72,4 +72,4 @@ public class PosedData: NSObject { public func dispose() { spine_posed_data_dispose(_ptr.assumingMemoryBound(to: spine_posed_data_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/position_mode.swift b/spine-ios/Sources/SpineSwift/Generated/position_mode.swift index 5ee15273a..e081c7eba 100644 --- a/spine-ios/Sources/SpineSwift/Generated/position_mode.swift +++ b/spine-ios/Sources/SpineSwift/Generated/position_mode.swift @@ -39,4 +39,4 @@ public enum PositionMode: Int32, CaseIterable { public static func fromValue(_ value: Int32) -> PositionMode? { return PositionMode(rawValue: value) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/property.swift b/spine-ios/Sources/SpineSwift/Generated/property.swift index 0504762e8..166c960b6 100644 --- a/spine-ios/Sources/SpineSwift/Generated/property.swift +++ b/spine-ios/Sources/SpineSwift/Generated/property.swift @@ -53,19 +53,19 @@ public enum Property: Int32, CaseIterable { case pathConstraintPosition = 131072 case pathConstraintSpacing = 262144 case pathConstraintMix = 524288 - case physicsConstraintInertia = 1_048_576 - case physicsConstraintStrength = 2_097_152 - case physicsConstraintDamping = 4_194_304 - case physicsConstraintMass = 8_388_608 - case physicsConstraintWind = 16_777_216 - case physicsConstraintGravity = 33_554_432 - case physicsConstraintMix = 67_108_864 - case physicsConstraintReset = 134_217_728 - case sequence = 268_435_456 - case sliderTime = 536_870_912 - case sliderMix = 1_073_741_824 + case physicsConstraintInertia = 1048576 + case physicsConstraintStrength = 2097152 + case physicsConstraintDamping = 4194304 + case physicsConstraintMass = 8388608 + case physicsConstraintWind = 16777216 + case physicsConstraintGravity = 33554432 + case physicsConstraintMix = 67108864 + case physicsConstraintReset = 134217728 + case sequence = 268435456 + case sliderTime = 536870912 + case sliderMix = 1073741824 public static func fromValue(_ value: Int32) -> Property? { return Property(rawValue: value) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/region_attachment.swift b/spine-ios/Sources/SpineSwift/Generated/region_attachment.swift index a3da8fad6..eaba874a0 100644 --- a/spine-ios/Sources/SpineSwift/Generated/region_attachment.swift +++ b/spine-ios/Sources/SpineSwift/Generated/region_attachment.swift @@ -41,15 +41,15 @@ public class RegionAttachment: Attachment { super.init(fromPointer: UnsafeMutableRawPointer(ptr).assumingMemoryBound(to: spine_attachment_wrapper.self)) } - public convenience init(_ name: String) { - let ptr = spine_region_attachment_create(name) + public convenience init(_ name: String, _ sequence: Sequence?) { + let ptr = spine_region_attachment_create(name, sequence?._ptr.assumingMemoryBound(to: spine_sequence_wrapper.self)) self.init(fromPointer: ptr!) } public var x: Float { get { let result = spine_region_attachment_get_x(_ptr.assumingMemoryBound(to: spine_region_attachment_wrapper.self)) - return result + return result } set { spine_region_attachment_set_x(_ptr.assumingMemoryBound(to: spine_region_attachment_wrapper.self), newValue) @@ -59,27 +59,17 @@ public class RegionAttachment: Attachment { public var y: Float { get { let result = spine_region_attachment_get_y(_ptr.assumingMemoryBound(to: spine_region_attachment_wrapper.self)) - return result + return result } set { spine_region_attachment_set_y(_ptr.assumingMemoryBound(to: spine_region_attachment_wrapper.self), newValue) } } - public var rotation: Float { - get { - let result = spine_region_attachment_get_rotation(_ptr.assumingMemoryBound(to: spine_region_attachment_wrapper.self)) - return result - } - set { - spine_region_attachment_set_rotation(_ptr.assumingMemoryBound(to: spine_region_attachment_wrapper.self), newValue) - } - } - public var scaleX: Float { get { let result = spine_region_attachment_get_scale_x(_ptr.assumingMemoryBound(to: spine_region_attachment_wrapper.self)) - return result + return result } set { spine_region_attachment_set_scale_x(_ptr.assumingMemoryBound(to: spine_region_attachment_wrapper.self), newValue) @@ -89,17 +79,27 @@ public class RegionAttachment: Attachment { public var scaleY: Float { get { let result = spine_region_attachment_get_scale_y(_ptr.assumingMemoryBound(to: spine_region_attachment_wrapper.self)) - return result + return result } set { spine_region_attachment_set_scale_y(_ptr.assumingMemoryBound(to: spine_region_attachment_wrapper.self), newValue) } } + public var rotation: Float { + get { + let result = spine_region_attachment_get_rotation(_ptr.assumingMemoryBound(to: spine_region_attachment_wrapper.self)) + return result + } + set { + spine_region_attachment_set_rotation(_ptr.assumingMemoryBound(to: spine_region_attachment_wrapper.self), newValue) + } + } + public var width: Float { get { let result = spine_region_attachment_get_width(_ptr.assumingMemoryBound(to: spine_region_attachment_wrapper.self)) - return result + return result } set { spine_region_attachment_set_width(_ptr.assumingMemoryBound(to: spine_region_attachment_wrapper.self), newValue) @@ -109,73 +109,56 @@ public class RegionAttachment: Attachment { public var height: Float { get { let result = spine_region_attachment_get_height(_ptr.assumingMemoryBound(to: spine_region_attachment_wrapper.self)) - return result + return result } set { spine_region_attachment_set_height(_ptr.assumingMemoryBound(to: spine_region_attachment_wrapper.self), newValue) } } + public var sequence: Sequence { + let result = spine_region_attachment_get_sequence(_ptr.assumingMemoryBound(to: spine_region_attachment_wrapper.self)) + return Sequence(fromPointer: result!) + } + + public var path: String { + get { + let result = spine_region_attachment_get_path(_ptr.assumingMemoryBound(to: spine_region_attachment_wrapper.self)) + return String(cString: result!) + } + set { + spine_region_attachment_set_path(_ptr.assumingMemoryBound(to: spine_region_attachment_wrapper.self), newValue) + } + } + public var color: Color { let result = spine_region_attachment_get_color(_ptr.assumingMemoryBound(to: spine_region_attachment_wrapper.self)) return Color(fromPointer: result!) } - public var path: String { - get { - let result = spine_region_attachment_get_path(_ptr.assumingMemoryBound(to: spine_region_attachment_wrapper.self)) - return String(cString: result!) - } - set { - spine_region_attachment_set_path(_ptr.assumingMemoryBound(to: spine_region_attachment_wrapper.self), newValue) - } - } - - public var region: TextureRegion? { - get { - let result = spine_region_attachment_get_region(_ptr.assumingMemoryBound(to: spine_region_attachment_wrapper.self)) - return result.map { TextureRegion(fromPointer: $0) } - } - set { - spine_region_attachment_set_region( - _ptr.assumingMemoryBound(to: spine_region_attachment_wrapper.self), - newValue?._ptr.assumingMemoryBound(to: spine_texture_region_wrapper.self)) - } - } - - public var sequence: Sequence? { - get { - let result = spine_region_attachment_get_sequence(_ptr.assumingMemoryBound(to: spine_region_attachment_wrapper.self)) - return result.map { Sequence(fromPointer: $0) } - } - set { - spine_region_attachment_set_sequence( - _ptr.assumingMemoryBound(to: spine_region_attachment_wrapper.self), - newValue?._ptr.assumingMemoryBound(to: spine_sequence_wrapper.self)) - } - } - - public var offset: ArrayFloat { - let result = spine_region_attachment_get_offset(_ptr.assumingMemoryBound(to: spine_region_attachment_wrapper.self)) + /// Returns the vertex offsets for the specified slot pose. + public func getOffsets(_ pose: SlotPose) -> ArrayFloat { + let result = spine_region_attachment_get_offsets(_ptr.assumingMemoryBound(to: spine_region_attachment_wrapper.self), pose._ptr.assumingMemoryBound(to: spine_slot_pose_wrapper.self)) return ArrayFloat(fromPointer: result!) } - public var uVs: ArrayFloat { - let result = spine_region_attachment_get_u_vs(_ptr.assumingMemoryBound(to: spine_region_attachment_wrapper.self)) - return ArrayFloat(fromPointer: result!) + public func updateSequence() { + spine_region_attachment_update_sequence(_ptr.assumingMemoryBound(to: spine_region_attachment_wrapper.self)) } - public func updateRegion() { - spine_region_attachment_update_region(_ptr.assumingMemoryBound(to: spine_region_attachment_wrapper.self)) + /// Computes UVs and offsets for a region attachment. + /// + /// - Parameter uvs: Output array for the computed UVs, length of 8. + /// - Parameter offset: Output array for the computed vertex offsets, length of 8. + public static func computeUVs(_ region: TextureRegion?, _ x: Float, _ y: Float, _ scaleX: Float, _ scaleY: Float, _ rotation: Float, _ width: Float, _ height: Float, _ offset: ArrayFloat, _ uvs: ArrayFloat) { + spine_region_attachment_compute_u_vs(region?._ptr.assumingMemoryBound(to: spine_texture_region_wrapper.self), x, y, scaleX, scaleY, rotation, width, height, offset._ptr.assumingMemoryBound(to: spine_array_float_wrapper.self), uvs._ptr.assumingMemoryBound(to: spine_array_float_wrapper.self)) } - public func computeWorldVertices(_ slot: Slot, _ worldVertices: ArrayFloat, _ offset: Int, _ stride: Int) { - spine_region_attachment_compute_world_vertices_2( - _ptr.assumingMemoryBound(to: spine_region_attachment_wrapper.self), slot._ptr.assumingMemoryBound(to: spine_slot_wrapper.self), - worldVertices._ptr.assumingMemoryBound(to: spine_array_float_wrapper.self), offset, stride) + public func computeWorldVertices(_ slot: Slot, _ vertexOffsets: ArrayFloat, _ worldVertices: ArrayFloat, _ offset: Int, _ stride: Int) { + spine_region_attachment_compute_world_vertices_2(_ptr.assumingMemoryBound(to: spine_region_attachment_wrapper.self), slot._ptr.assumingMemoryBound(to: spine_slot_wrapper.self), vertexOffsets._ptr.assumingMemoryBound(to: spine_array_float_wrapper.self), worldVertices._ptr.assumingMemoryBound(to: spine_array_float_wrapper.self), offset, stride) } public func dispose() { spine_region_attachment_dispose(_ptr.assumingMemoryBound(to: spine_region_attachment_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/render_command.swift b/spine-ios/Sources/SpineSwift/Generated/render_command.swift index caaa5159c..cd76d6ccd 100644 --- a/spine-ios/Sources/SpineSwift/Generated/render_command.swift +++ b/spine-ios/Sources/SpineSwift/Generated/render_command.swift @@ -96,4 +96,4 @@ public class RenderCommand: NSObject { public func dispose() { spine_render_command_dispose(_ptr.assumingMemoryBound(to: spine_render_command_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/rgb2_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/rgb2_timeline.swift index 263c245c7..0f2c6fd71 100644 --- a/spine-ios/Sources/SpineSwift/Generated/rgb2_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/rgb2_timeline.swift @@ -58,4 +58,4 @@ public class Rgb2Timeline: SlotCurveTimeline { public func dispose() { spine_rgb2_timeline_dispose(_ptr.assumingMemoryBound(to: spine_rgb2_timeline_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/rgb_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/rgb_timeline.swift index 356b30703..46d9cae4d 100644 --- a/spine-ios/Sources/SpineSwift/Generated/rgb_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/rgb_timeline.swift @@ -57,4 +57,4 @@ public class RgbTimeline: SlotCurveTimeline { public func dispose() { spine_rgb_timeline_dispose(_ptr.assumingMemoryBound(to: spine_rgb_timeline_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/rgba2_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/rgba2_timeline.swift index 7ff6eb6d6..26a0c3010 100644 --- a/spine-ios/Sources/SpineSwift/Generated/rgba2_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/rgba2_timeline.swift @@ -57,4 +57,4 @@ public class Rgba2Timeline: SlotCurveTimeline { public func dispose() { spine_rgba2_timeline_dispose(_ptr.assumingMemoryBound(to: spine_rgba2_timeline_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/rgba_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/rgba_timeline.swift index 940d33cce..5ccf74c86 100644 --- a/spine-ios/Sources/SpineSwift/Generated/rgba_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/rgba_timeline.swift @@ -57,4 +57,4 @@ public class RgbaTimeline: SlotCurveTimeline { public func dispose() { spine_rgba_timeline_dispose(_ptr.assumingMemoryBound(to: spine_rgba_timeline_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/rotate_mode.swift b/spine-ios/Sources/SpineSwift/Generated/rotate_mode.swift index faf40e844..db4823efd 100644 --- a/spine-ios/Sources/SpineSwift/Generated/rotate_mode.swift +++ b/spine-ios/Sources/SpineSwift/Generated/rotate_mode.swift @@ -40,4 +40,4 @@ public enum RotateMode: Int32, CaseIterable { public static func fromValue(_ value: Int32) -> RotateMode? { return RotateMode(rawValue: value) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/rotate_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/rotate_timeline.swift index 23d497a83..1271d7650 100644 --- a/spine-ios/Sources/SpineSwift/Generated/rotate_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/rotate_timeline.swift @@ -49,4 +49,4 @@ public class RotateTimeline: BoneTimeline1 { public func dispose() { spine_rotate_timeline_dispose(_ptr.assumingMemoryBound(to: spine_rotate_timeline_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/scale_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/scale_timeline.swift index 4c19f6103..ec229763b 100644 --- a/spine-ios/Sources/SpineSwift/Generated/scale_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/scale_timeline.swift @@ -49,4 +49,4 @@ public class ScaleTimeline: BoneTimeline2 { public func dispose() { spine_scale_timeline_dispose(_ptr.assumingMemoryBound(to: spine_scale_timeline_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/scale_x_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/scale_x_timeline.swift index 243a5fd05..794cb3b83 100644 --- a/spine-ios/Sources/SpineSwift/Generated/scale_x_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/scale_x_timeline.swift @@ -49,4 +49,4 @@ public class ScaleXTimeline: BoneTimeline1 { public func dispose() { spine_scale_x_timeline_dispose(_ptr.assumingMemoryBound(to: spine_scale_x_timeline_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/scale_y_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/scale_y_timeline.swift index f0ce4bda4..4762a844e 100644 --- a/spine-ios/Sources/SpineSwift/Generated/scale_y_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/scale_y_timeline.swift @@ -49,4 +49,4 @@ public class ScaleYTimeline: BoneTimeline1 { public func dispose() { spine_scale_y_timeline_dispose(_ptr.assumingMemoryBound(to: spine_scale_y_timeline_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/sequence_mode.swift b/spine-ios/Sources/SpineSwift/Generated/sequence_mode.swift index c82d36bb8..e8ee7ee48 100644 --- a/spine-ios/Sources/SpineSwift/Generated/sequence_mode.swift +++ b/spine-ios/Sources/SpineSwift/Generated/sequence_mode.swift @@ -44,4 +44,4 @@ public enum SequenceMode: Int32, CaseIterable { public static func fromValue(_ value: Int32) -> SequenceMode? { return SequenceMode(rawValue: value) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/sequence_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/sequence_timeline.swift index 5daf2ace6..0ae4a295b 100644 --- a/spine-ios/Sources/SpineSwift/Generated/sequence_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/sequence_timeline.swift @@ -77,7 +77,7 @@ public class SequenceTimeline: Timeline, SlotTimeline { public var slotIndex: Int32 { get { let result = spine_sequence_timeline_get_slot_index(_ptr.assumingMemoryBound(to: spine_sequence_timeline_wrapper.self)) - return result + return result } set { spine_sequence_timeline_set_slot_index(_ptr.assumingMemoryBound(to: spine_sequence_timeline_wrapper.self), newValue) @@ -89,12 +89,10 @@ public class SequenceTimeline: Timeline, SlotTimeline { /// - Parameter frame: Between 0 and frameCount, inclusive. /// - Parameter delay: Seconds between frames. public func setFrame(_ frame: Int32, _ time: Float, _ mode: SequenceMode, _ index: Int32, _ delay: Float) { - spine_sequence_timeline_set_frame( - _ptr.assumingMemoryBound(to: spine_sequence_timeline_wrapper.self), frame, time, spine_sequence_mode(rawValue: UInt32(mode.rawValue)), - index, delay) + spine_sequence_timeline_set_frame(_ptr.assumingMemoryBound(to: spine_sequence_timeline_wrapper.self), frame, time, spine_sequence_mode(rawValue: UInt32(mode.rawValue)), index, delay) } public func dispose() { spine_sequence_timeline_dispose(_ptr.assumingMemoryBound(to: spine_sequence_timeline_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/shear_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/shear_timeline.swift index 120811db6..61bc32817 100644 --- a/spine-ios/Sources/SpineSwift/Generated/shear_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/shear_timeline.swift @@ -49,4 +49,4 @@ public class ShearTimeline: BoneTimeline2 { public func dispose() { spine_shear_timeline_dispose(_ptr.assumingMemoryBound(to: spine_shear_timeline_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/shear_x_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/shear_x_timeline.swift index 3f78c8d19..15a818a96 100644 --- a/spine-ios/Sources/SpineSwift/Generated/shear_x_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/shear_x_timeline.swift @@ -49,4 +49,4 @@ public class ShearXTimeline: BoneTimeline1 { public func dispose() { spine_shear_x_timeline_dispose(_ptr.assumingMemoryBound(to: spine_shear_x_timeline_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/shear_y_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/shear_y_timeline.swift index f6e530adc..7a2e7ead7 100644 --- a/spine-ios/Sources/SpineSwift/Generated/shear_y_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/shear_y_timeline.swift @@ -49,4 +49,4 @@ public class ShearYTimeline: BoneTimeline1 { public func dispose() { spine_shear_y_timeline_dispose(_ptr.assumingMemoryBound(to: spine_shear_y_timeline_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/skeleton_binary.swift b/spine-ios/Sources/SpineSwift/Generated/skeleton_binary.swift index 8b4512802..d0e318989 100644 --- a/spine-ios/Sources/SpineSwift/Generated/skeleton_binary.swift +++ b/spine-ios/Sources/SpineSwift/Generated/skeleton_binary.swift @@ -73,4 +73,4 @@ public class SkeletonBinary: NSObject { public func dispose() { spine_skeleton_binary_dispose(_ptr.assumingMemoryBound(to: spine_skeleton_binary_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/skeleton_bounds.swift b/spine-ios/Sources/SpineSwift/Generated/skeleton_bounds.swift index 04eb9ef0c..7af2f559f 100644 --- a/spine-ios/Sources/SpineSwift/Generated/skeleton_bounds.swift +++ b/spine-ios/Sources/SpineSwift/Generated/skeleton_bounds.swift @@ -104,9 +104,7 @@ public class SkeletonBounds: NSObject { /// - Parameter skeleton: The skeleton. /// - Parameter updateAabb: If true, the axis aligned bounding box containing all the polygons is computed. If false, the SkeletonBounds AABB methods will always return true. public func update(_ skeleton: Skeleton, _ updateAabb: Bool) { - spine_skeleton_bounds_update( - _ptr.assumingMemoryBound(to: spine_skeleton_bounds_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self), - updateAabb) + spine_skeleton_bounds_update(_ptr.assumingMemoryBound(to: spine_skeleton_bounds_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self), updateAabb) } /// Returns true if the axis aligned bounding box contains the point. @@ -124,31 +122,26 @@ public class SkeletonBounds: NSObject { /// Returns true if the axis aligned bounding box intersects the axis aligned bounding box of /// the specified bounds. public func aabbIntersectsSkeleton(_ bounds: SkeletonBounds) -> Bool { - let result = spine_skeleton_bounds_aabb_intersects_skeleton( - _ptr.assumingMemoryBound(to: spine_skeleton_bounds_wrapper.self), bounds._ptr.assumingMemoryBound(to: spine_skeleton_bounds_wrapper.self)) + let result = spine_skeleton_bounds_aabb_intersects_skeleton(_ptr.assumingMemoryBound(to: spine_skeleton_bounds_wrapper.self), bounds._ptr.assumingMemoryBound(to: spine_skeleton_bounds_wrapper.self)) return result } /// Returns the polygon for the given bounding box attachment or null if no polygon can be found /// for the attachment. Requires a call to update() first. public func getPolygon(_ attachment: BoundingBoxAttachment?) -> Polygon? { - let result = spine_skeleton_bounds_get_polygon( - _ptr.assumingMemoryBound(to: spine_skeleton_bounds_wrapper.self), - attachment?._ptr.assumingMemoryBound(to: spine_bounding_box_attachment_wrapper.self)) + let result = spine_skeleton_bounds_get_polygon(_ptr.assumingMemoryBound(to: spine_skeleton_bounds_wrapper.self), attachment?._ptr.assumingMemoryBound(to: spine_bounding_box_attachment_wrapper.self)) return result.map { Polygon(fromPointer: $0) } } /// Returns the bounding box for the given polygon or null. Requires a call to update() first. public func getBoundingBox(_ polygon: Polygon?) -> BoundingBoxAttachment? { - let result = spine_skeleton_bounds_get_bounding_box( - _ptr.assumingMemoryBound(to: spine_skeleton_bounds_wrapper.self), polygon?._ptr.assumingMemoryBound(to: spine_polygon_wrapper.self)) + let result = spine_skeleton_bounds_get_bounding_box(_ptr.assumingMemoryBound(to: spine_skeleton_bounds_wrapper.self), polygon?._ptr.assumingMemoryBound(to: spine_polygon_wrapper.self)) return result.map { BoundingBoxAttachment(fromPointer: $0) } } /// Returns true if the polygon contains the point. public func containsPoint(_ polygon: Polygon, _ x: Float, _ y: Float) -> Bool { - let result = spine_skeleton_bounds_contains_point_1( - _ptr.assumingMemoryBound(to: spine_skeleton_bounds_wrapper.self), polygon._ptr.assumingMemoryBound(to: spine_polygon_wrapper.self), x, y) + let result = spine_skeleton_bounds_contains_point_1(_ptr.assumingMemoryBound(to: spine_skeleton_bounds_wrapper.self), polygon._ptr.assumingMemoryBound(to: spine_polygon_wrapper.self), x, y) return result } @@ -170,13 +163,11 @@ public class SkeletonBounds: NSObject { /// Returns true if the polygon contains any part of the line segment. public func intersectsSegment2(_ polygon: Polygon, _ x1: Float, _ y1: Float, _ x2: Float, _ y2: Float) -> Bool { - let result = spine_skeleton_bounds_intersects_segment_2( - _ptr.assumingMemoryBound(to: spine_skeleton_bounds_wrapper.self), polygon._ptr.assumingMemoryBound(to: spine_polygon_wrapper.self), x1, - y1, x2, y2) + let result = spine_skeleton_bounds_intersects_segment_2(_ptr.assumingMemoryBound(to: spine_skeleton_bounds_wrapper.self), polygon._ptr.assumingMemoryBound(to: spine_polygon_wrapper.self), x1, y1, x2, y2) return result } public func dispose() { spine_skeleton_bounds_dispose(_ptr.assumingMemoryBound(to: spine_skeleton_bounds_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/skeleton_clipping.swift b/spine-ios/Sources/SpineSwift/Generated/skeleton_clipping.swift index b33b15a73..07cfd976c 100644 --- a/spine-ios/Sources/SpineSwift/Generated/skeleton_clipping.swift +++ b/spine-ios/Sources/SpineSwift/Generated/skeleton_clipping.swift @@ -69,15 +69,12 @@ public class SkeletonClipping: NSObject { } public func clipStart(_ skeleton: Skeleton, _ slot: Slot, _ clip: ClippingAttachment?) -> Int { - let result = spine_skeleton_clipping_clip_start( - _ptr.assumingMemoryBound(to: spine_skeleton_clipping_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self), - slot._ptr.assumingMemoryBound(to: spine_slot_wrapper.self), clip?._ptr.assumingMemoryBound(to: spine_clipping_attachment_wrapper.self)) + let result = spine_skeleton_clipping_clip_start(_ptr.assumingMemoryBound(to: spine_skeleton_clipping_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self), slot._ptr.assumingMemoryBound(to: spine_slot_wrapper.self), clip?._ptr.assumingMemoryBound(to: spine_clipping_attachment_wrapper.self)) return result } public func clipEnd(_ slot: Slot) { - spine_skeleton_clipping_clip_end_1( - _ptr.assumingMemoryBound(to: spine_skeleton_clipping_wrapper.self), slot._ptr.assumingMemoryBound(to: spine_slot_wrapper.self)) + spine_skeleton_clipping_clip_end_1(_ptr.assumingMemoryBound(to: spine_skeleton_clipping_wrapper.self), slot._ptr.assumingMemoryBound(to: spine_slot_wrapper.self)) } public func clipEnd2() { @@ -85,14 +82,11 @@ public class SkeletonClipping: NSObject { } public func clipTriangles(_ vertices: ArrayFloat, _ triangles: ArrayUnsignedShort, _ uvs: ArrayFloat, _ stride: Int) -> Bool { - let result = spine_skeleton_clipping_clip_triangles_3( - _ptr.assumingMemoryBound(to: spine_skeleton_clipping_wrapper.self), vertices._ptr.assumingMemoryBound(to: spine_array_float_wrapper.self), - triangles._ptr.assumingMemoryBound(to: spine_array_unsigned_short_wrapper.self), - uvs._ptr.assumingMemoryBound(to: spine_array_float_wrapper.self), stride) + let result = spine_skeleton_clipping_clip_triangles_3(_ptr.assumingMemoryBound(to: spine_skeleton_clipping_wrapper.self), vertices._ptr.assumingMemoryBound(to: spine_array_float_wrapper.self), triangles._ptr.assumingMemoryBound(to: spine_array_unsigned_short_wrapper.self), uvs._ptr.assumingMemoryBound(to: spine_array_float_wrapper.self), stride) return result } public func dispose() { spine_skeleton_clipping_dispose(_ptr.assumingMemoryBound(to: spine_skeleton_clipping_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/skeleton_data.swift b/spine-ios/Sources/SpineSwift/Generated/skeleton_data.swift index a889259d6..406e49995 100644 --- a/spine-ios/Sources/SpineSwift/Generated/skeleton_data.swift +++ b/spine-ios/Sources/SpineSwift/Generated/skeleton_data.swift @@ -55,7 +55,7 @@ public class SkeletonData: NSObject { public var name: String { get { let result = spine_skeleton_data_get_name(_ptr.assumingMemoryBound(to: spine_skeleton_data_wrapper.self)) - return String(cString: result!) + return String(cString: result!) } set { spine_skeleton_data_set_name(_ptr.assumingMemoryBound(to: spine_skeleton_data_wrapper.self), newValue) @@ -87,11 +87,10 @@ public class SkeletonData: NSObject { public var defaultSkin: Skin? { get { let result = spine_skeleton_data_get_default_skin(_ptr.assumingMemoryBound(to: spine_skeleton_data_wrapper.self)) - return result.map { Skin(fromPointer: $0) } + return result.map { Skin(fromPointer: $0) } } set { - spine_skeleton_data_set_default_skin( - _ptr.assumingMemoryBound(to: spine_skeleton_data_wrapper.self), newValue?._ptr.assumingMemoryBound(to: spine_skin_wrapper.self)) + spine_skeleton_data_set_default_skin(_ptr.assumingMemoryBound(to: spine_skeleton_data_wrapper.self), newValue?._ptr.assumingMemoryBound(to: spine_skin_wrapper.self)) } } @@ -117,7 +116,7 @@ public class SkeletonData: NSObject { public var x: Float { get { let result = spine_skeleton_data_get_x(_ptr.assumingMemoryBound(to: spine_skeleton_data_wrapper.self)) - return result + return result } set { spine_skeleton_data_set_x(_ptr.assumingMemoryBound(to: spine_skeleton_data_wrapper.self), newValue) @@ -128,7 +127,7 @@ public class SkeletonData: NSObject { public var y: Float { get { let result = spine_skeleton_data_get_y(_ptr.assumingMemoryBound(to: spine_skeleton_data_wrapper.self)) - return result + return result } set { spine_skeleton_data_set_y(_ptr.assumingMemoryBound(to: spine_skeleton_data_wrapper.self), newValue) @@ -139,7 +138,7 @@ public class SkeletonData: NSObject { public var width: Float { get { let result = spine_skeleton_data_get_width(_ptr.assumingMemoryBound(to: spine_skeleton_data_wrapper.self)) - return result + return result } set { spine_skeleton_data_set_width(_ptr.assumingMemoryBound(to: spine_skeleton_data_wrapper.self), newValue) @@ -150,7 +149,7 @@ public class SkeletonData: NSObject { public var height: Float { get { let result = spine_skeleton_data_get_height(_ptr.assumingMemoryBound(to: spine_skeleton_data_wrapper.self)) - return result + return result } set { spine_skeleton_data_set_height(_ptr.assumingMemoryBound(to: spine_skeleton_data_wrapper.self), newValue) @@ -162,7 +161,7 @@ public class SkeletonData: NSObject { public var referenceScale: Float { get { let result = spine_skeleton_data_get_reference_scale(_ptr.assumingMemoryBound(to: spine_skeleton_data_wrapper.self)) - return result + return result } set { spine_skeleton_data_set_reference_scale(_ptr.assumingMemoryBound(to: spine_skeleton_data_wrapper.self), newValue) @@ -173,7 +172,7 @@ public class SkeletonData: NSObject { public var version: String { get { let result = spine_skeleton_data_get_version(_ptr.assumingMemoryBound(to: spine_skeleton_data_wrapper.self)) - return String(cString: result!) + return String(cString: result!) } set { spine_skeleton_data_set_version(_ptr.assumingMemoryBound(to: spine_skeleton_data_wrapper.self), newValue) @@ -184,7 +183,7 @@ public class SkeletonData: NSObject { public var hashString: String { get { let result = spine_skeleton_data_get_hash(_ptr.assumingMemoryBound(to: spine_skeleton_data_wrapper.self)) - return String(cString: result!) + return String(cString: result!) } set { spine_skeleton_data_set_hash(_ptr.assumingMemoryBound(to: spine_skeleton_data_wrapper.self), newValue) @@ -196,7 +195,7 @@ public class SkeletonData: NSObject { public var imagesPath: String { get { let result = spine_skeleton_data_get_images_path(_ptr.assumingMemoryBound(to: spine_skeleton_data_wrapper.self)) - return String(cString: result!) + return String(cString: result!) } set { spine_skeleton_data_set_images_path(_ptr.assumingMemoryBound(to: spine_skeleton_data_wrapper.self), newValue) @@ -208,7 +207,7 @@ public class SkeletonData: NSObject { public var audioPath: String { get { let result = spine_skeleton_data_get_audio_path(_ptr.assumingMemoryBound(to: spine_skeleton_data_wrapper.self)) - return String(cString: result!) + return String(cString: result!) } set { spine_skeleton_data_set_audio_path(_ptr.assumingMemoryBound(to: spine_skeleton_data_wrapper.self), newValue) @@ -219,7 +218,7 @@ public class SkeletonData: NSObject { public var fps: Float { get { let result = spine_skeleton_data_get_fps(_ptr.assumingMemoryBound(to: spine_skeleton_data_wrapper.self)) - return result + return result } set { spine_skeleton_data_set_fps(_ptr.assumingMemoryBound(to: spine_skeleton_data_wrapper.self), newValue) @@ -262,4 +261,4 @@ public class SkeletonData: NSObject { public func dispose() { spine_skeleton_data_dispose(_ptr.assumingMemoryBound(to: spine_skeleton_data_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/skeleton_json.swift b/spine-ios/Sources/SpineSwift/Generated/skeleton_json.swift index 511970734..e8e956f28 100644 --- a/spine-ios/Sources/SpineSwift/Generated/skeleton_json.swift +++ b/spine-ios/Sources/SpineSwift/Generated/skeleton_json.swift @@ -78,4 +78,4 @@ public class SkeletonJson: NSObject { public func dispose() { spine_skeleton_json_dispose(_ptr.assumingMemoryBound(to: spine_skeleton_json_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/skeleton_renderer.swift b/spine-ios/Sources/SpineSwift/Generated/skeleton_renderer.swift index 7232467d6..439f9690e 100644 --- a/spine-ios/Sources/SpineSwift/Generated/skeleton_renderer.swift +++ b/spine-ios/Sources/SpineSwift/Generated/skeleton_renderer.swift @@ -49,12 +49,11 @@ public class SkeletonRenderer: NSObject { } public func render(_ skeleton: Skeleton) -> RenderCommand? { - let result = spine_skeleton_renderer_render( - _ptr.assumingMemoryBound(to: spine_skeleton_renderer_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) + let result = spine_skeleton_renderer_render(_ptr.assumingMemoryBound(to: spine_skeleton_renderer_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) return result.map { RenderCommand(fromPointer: $0) } } public func dispose() { spine_skeleton_renderer_dispose(_ptr.assumingMemoryBound(to: spine_skeleton_renderer_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/slider_base.swift b/spine-ios/Sources/SpineSwift/Generated/slider_base.swift index 684e7b133..19724dca0 100644 --- a/spine-ios/Sources/SpineSwift/Generated/slider_base.swift +++ b/spine-ios/Sources/SpineSwift/Generated/slider_base.swift @@ -83,15 +83,12 @@ open class SliderBase: PosedActive, Posed, Constraint { } public func sort(_ skeleton: Skeleton) { - spine_slider_base_sort( - _ptr.assumingMemoryBound(to: spine_slider_base_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) + spine_slider_base_sort(_ptr.assumingMemoryBound(to: spine_slider_base_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) } /// Inherited from Update public func update(_ skeleton: Skeleton, _ physics: Physics) { - spine_slider_base_update( - _ptr.assumingMemoryBound(to: spine_slider_base_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self), - spine_physics(rawValue: UInt32(physics.rawValue))) + spine_slider_base_update(_ptr.assumingMemoryBound(to: spine_slider_base_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self), spine_physics(rawValue: UInt32(physics.rawValue))) } public static func rttiStatic() -> Rtti { @@ -99,4 +96,4 @@ open class SliderBase: PosedActive, Posed, Constraint { return Rtti(fromPointer: result!) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/slider_data.swift b/spine-ios/Sources/SpineSwift/Generated/slider_data.swift index c86a8606d..c7d973c26 100644 --- a/spine-ios/Sources/SpineSwift/Generated/slider_data.swift +++ b/spine-ios/Sources/SpineSwift/Generated/slider_data.swift @@ -54,18 +54,17 @@ public class SliderData: PosedData, ConstraintData { public var animation: Animation { get { let result = spine_slider_data_get_animation(_ptr.assumingMemoryBound(to: spine_slider_data_wrapper.self)) - return Animation(fromPointer: result!) + return Animation(fromPointer: result!) } set { - spine_slider_data_set_animation( - _ptr.assumingMemoryBound(to: spine_slider_data_wrapper.self), newValue._ptr.assumingMemoryBound(to: spine_animation_wrapper.self)) + spine_slider_data_set_animation(_ptr.assumingMemoryBound(to: spine_slider_data_wrapper.self), newValue._ptr.assumingMemoryBound(to: spine_animation_wrapper.self)) } } public var additive: Bool { get { let result = spine_slider_data_get_additive(_ptr.assumingMemoryBound(to: spine_slider_data_wrapper.self)) - return result + return result } set { spine_slider_data_set_additive(_ptr.assumingMemoryBound(to: spine_slider_data_wrapper.self), newValue) @@ -75,7 +74,7 @@ public class SliderData: PosedData, ConstraintData { public var loop: Bool { get { let result = spine_slider_data_get_loop(_ptr.assumingMemoryBound(to: spine_slider_data_wrapper.self)) - return result + return result } set { spine_slider_data_set_loop(_ptr.assumingMemoryBound(to: spine_slider_data_wrapper.self), newValue) @@ -85,54 +84,51 @@ public class SliderData: PosedData, ConstraintData { public var bone: BoneData? { get { let result = spine_slider_data_get_bone(_ptr.assumingMemoryBound(to: spine_slider_data_wrapper.self)) - return result.map { BoneData(fromPointer: $0) } + return result.map { BoneData(fromPointer: $0) } } set { - spine_slider_data_set_bone( - _ptr.assumingMemoryBound(to: spine_slider_data_wrapper.self), newValue?._ptr.assumingMemoryBound(to: spine_bone_data_wrapper.self)) + spine_slider_data_set_bone(_ptr.assumingMemoryBound(to: spine_slider_data_wrapper.self), newValue?._ptr.assumingMemoryBound(to: spine_bone_data_wrapper.self)) } } public var property: FromProperty? { get { 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 rttiClassName = String(cString: spine_rtti_get_class_name(rtti)!) - switch rttiClassName { - case "FromRotate": - let castedPtr = spine_from_property_cast_to_from_rotate(ptr) - return FromRotate(fromPointer: castedPtr!) - case "FromScaleX": - let castedPtr = spine_from_property_cast_to_from_scale_x(ptr) - return FromScaleX(fromPointer: castedPtr!) - case "FromScaleY": - let castedPtr = spine_from_property_cast_to_from_scale_y(ptr) - return FromScaleY(fromPointer: castedPtr!) - case "FromShearY": - let castedPtr = spine_from_property_cast_to_from_shear_y(ptr) - return FromShearY(fromPointer: castedPtr!) - case "FromX": - let castedPtr = spine_from_property_cast_to_from_x(ptr) - return FromX(fromPointer: castedPtr!) - case "FromY": - let castedPtr = spine_from_property_cast_to_from_y(ptr) - return FromY(fromPointer: castedPtr!) - default: - fatalError("Unknown concrete type: \(rttiClassName) for abstract class FromProperty") - } + guard let ptr = result else { return nil } + let rtti = spine_from_property_get_rtti(ptr) + let rttiClassName = String(cString: spine_rtti_get_class_name(rtti)!) + switch rttiClassName { + case "FromRotate": + let castedPtr = spine_from_property_cast_to_from_rotate(ptr) + return FromRotate(fromPointer: castedPtr!) + case "FromScaleX": + let castedPtr = spine_from_property_cast_to_from_scale_x(ptr) + return FromScaleX(fromPointer: castedPtr!) + case "FromScaleY": + let castedPtr = spine_from_property_cast_to_from_scale_y(ptr) + return FromScaleY(fromPointer: castedPtr!) + case "FromShearY": + let castedPtr = spine_from_property_cast_to_from_shear_y(ptr) + return FromShearY(fromPointer: castedPtr!) + case "FromX": + let castedPtr = spine_from_property_cast_to_from_x(ptr) + return FromX(fromPointer: castedPtr!) + case "FromY": + let castedPtr = spine_from_property_cast_to_from_y(ptr) + return FromY(fromPointer: castedPtr!) + default: + fatalError("Unknown concrete type: \(rttiClassName) for abstract class FromProperty") + } } set { - spine_slider_data_set_property( - _ptr.assumingMemoryBound(to: spine_slider_data_wrapper.self), newValue?._ptr.assumingMemoryBound(to: spine_from_property_wrapper.self) - ) + spine_slider_data_set_property(_ptr.assumingMemoryBound(to: spine_slider_data_wrapper.self), newValue?._ptr.assumingMemoryBound(to: spine_from_property_wrapper.self)) } } public var scale: Float { get { let result = spine_slider_data_get_scale(_ptr.assumingMemoryBound(to: spine_slider_data_wrapper.self)) - return result + return result } set { spine_slider_data_set_scale(_ptr.assumingMemoryBound(to: spine_slider_data_wrapper.self), newValue) @@ -142,7 +138,7 @@ public class SliderData: PosedData, ConstraintData { public var offset: Float { get { let result = spine_slider_data_get_offset(_ptr.assumingMemoryBound(to: spine_slider_data_wrapper.self)) - return result + return result } set { spine_slider_data_set_offset(_ptr.assumingMemoryBound(to: spine_slider_data_wrapper.self), newValue) @@ -152,7 +148,7 @@ public class SliderData: PosedData, ConstraintData { public var local: Bool { get { let result = spine_slider_data_get_local(_ptr.assumingMemoryBound(to: spine_slider_data_wrapper.self)) - return result + return result } set { spine_slider_data_set_local(_ptr.assumingMemoryBound(to: spine_slider_data_wrapper.self), newValue) @@ -166,8 +162,7 @@ public class SliderData: PosedData, ConstraintData { /// Creates a slider instance. 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 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 rttiClassName = String(cString: spine_rtti_get_class_name(rtti)!) switch rttiClassName { @@ -199,4 +194,4 @@ public class SliderData: PosedData, ConstraintData { public override func dispose() { spine_slider_data_dispose(_ptr.assumingMemoryBound(to: spine_slider_data_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/slider_mix_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/slider_mix_timeline.swift index c8d316448..5bcfedf5f 100644 --- a/spine-ios/Sources/SpineSwift/Generated/slider_mix_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/slider_mix_timeline.swift @@ -49,4 +49,4 @@ public class SliderMixTimeline: ConstraintTimeline1 { public func dispose() { spine_slider_mix_timeline_dispose(_ptr.assumingMemoryBound(to: spine_slider_mix_timeline_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/slider_pose.swift b/spine-ios/Sources/SpineSwift/Generated/slider_pose.swift index 4f7bc1b2d..97d22209f 100644 --- a/spine-ios/Sources/SpineSwift/Generated/slider_pose.swift +++ b/spine-ios/Sources/SpineSwift/Generated/slider_pose.swift @@ -51,7 +51,7 @@ public class SliderPose: NSObject { public var time: Float { get { let result = spine_slider_pose_get_time(_ptr.assumingMemoryBound(to: spine_slider_pose_wrapper.self)) - return result + return result } set { spine_slider_pose_set_time(_ptr.assumingMemoryBound(to: spine_slider_pose_wrapper.self), newValue) @@ -61,7 +61,7 @@ public class SliderPose: NSObject { public var mix: Float { get { let result = spine_slider_pose_get_mix(_ptr.assumingMemoryBound(to: spine_slider_pose_wrapper.self)) - return result + return result } set { spine_slider_pose_set_mix(_ptr.assumingMemoryBound(to: spine_slider_pose_wrapper.self), newValue) @@ -69,11 +69,10 @@ public class SliderPose: NSObject { } public func set(_ pose: SliderPose) { - spine_slider_pose_set( - _ptr.assumingMemoryBound(to: spine_slider_pose_wrapper.self), pose._ptr.assumingMemoryBound(to: spine_slider_pose_wrapper.self)) + spine_slider_pose_set(_ptr.assumingMemoryBound(to: spine_slider_pose_wrapper.self), pose._ptr.assumingMemoryBound(to: spine_slider_pose_wrapper.self)) } public func dispose() { spine_slider_pose_dispose(_ptr.assumingMemoryBound(to: spine_slider_pose_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/slider_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/slider_timeline.swift index 0d45d774f..40feb3437 100644 --- a/spine-ios/Sources/SpineSwift/Generated/slider_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/slider_timeline.swift @@ -49,4 +49,4 @@ public class SliderTimeline: ConstraintTimeline1 { public func dispose() { spine_slider_timeline_dispose(_ptr.assumingMemoryBound(to: spine_slider_timeline_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/slot_curve_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/slot_curve_timeline.swift index a718bbd31..732101fbb 100644 --- a/spine-ios/Sources/SpineSwift/Generated/slot_curve_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/slot_curve_timeline.swift @@ -44,11 +44,11 @@ open class SlotCurveTimeline: CurveTimeline, SlotTimeline { public var slotIndex: Int32 { get { let result = spine_slot_curve_timeline_get_slot_index(_ptr.assumingMemoryBound(to: spine_slot_curve_timeline_wrapper.self)) - return result + return result } set { spine_slot_curve_timeline_set_slot_index(_ptr.assumingMemoryBound(to: spine_slot_curve_timeline_wrapper.self), newValue) } } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/slot_data.swift b/spine-ios/Sources/SpineSwift/Generated/slot_data.swift index 50ce085a6..09f532081 100644 --- a/spine-ios/Sources/SpineSwift/Generated/slot_data.swift +++ b/spine-ios/Sources/SpineSwift/Generated/slot_data.swift @@ -63,7 +63,7 @@ public class SlotData: PosedData { public var attachmentName: String { get { let result = spine_slot_data_get_attachment_name(_ptr.assumingMemoryBound(to: spine_slot_data_wrapper.self)) - return String(cString: result!) + return String(cString: result!) } set { spine_slot_data_set_attachment_name(_ptr.assumingMemoryBound(to: spine_slot_data_wrapper.self), newValue) @@ -74,11 +74,10 @@ public class SlotData: PosedData { public var blendMode: BlendMode { get { let result = spine_slot_data_get_blend_mode(_ptr.assumingMemoryBound(to: spine_slot_data_wrapper.self)) - return BlendMode(rawValue: Int32(result.rawValue))! + return BlendMode(rawValue: Int32(result.rawValue))! } set { - spine_slot_data_set_blend_mode( - _ptr.assumingMemoryBound(to: spine_slot_data_wrapper.self), spine_blend_mode(rawValue: UInt32(newValue.rawValue))) + spine_slot_data_set_blend_mode(_ptr.assumingMemoryBound(to: spine_slot_data_wrapper.self), spine_blend_mode(rawValue: UInt32(newValue.rawValue))) } } @@ -87,7 +86,7 @@ public class SlotData: PosedData { public var visible: Bool { get { let result = spine_slot_data_get_visible(_ptr.assumingMemoryBound(to: spine_slot_data_wrapper.self)) - return result + return result } set { spine_slot_data_set_visible(_ptr.assumingMemoryBound(to: spine_slot_data_wrapper.self), newValue) @@ -102,4 +101,4 @@ public class SlotData: PosedData { public override func dispose() { spine_slot_data_dispose(_ptr.assumingMemoryBound(to: spine_slot_data_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/slot_pose.swift b/spine-ios/Sources/SpineSwift/Generated/slot_pose.swift index 7b1d97c17..31f994fe1 100644 --- a/spine-ios/Sources/SpineSwift/Generated/slot_pose.swift +++ b/spine-ios/Sources/SpineSwift/Generated/slot_pose.swift @@ -66,7 +66,7 @@ public class SlotPose: NSObject { public var hasDarkColor: Bool { get { let result = spine_slot_pose_has_dark_color(_ptr.assumingMemoryBound(to: spine_slot_pose_wrapper.self)) - return result + return result } set { spine_slot_pose_set_has_dark_color(_ptr.assumingMemoryBound(to: spine_slot_pose_wrapper.self), newValue) @@ -77,35 +77,34 @@ public class SlotPose: NSObject { public var attachment: Attachment? { get { 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 rttiClassName = String(cString: spine_rtti_get_class_name(rtti)!) - switch rttiClassName { - case "BoundingBoxAttachment": - let castedPtr = spine_attachment_cast_to_bounding_box_attachment(ptr) - return BoundingBoxAttachment(fromPointer: castedPtr!) - case "ClippingAttachment": - let castedPtr = spine_attachment_cast_to_clipping_attachment(ptr) - return ClippingAttachment(fromPointer: castedPtr!) - case "MeshAttachment": - let castedPtr = spine_attachment_cast_to_mesh_attachment(ptr) - return MeshAttachment(fromPointer: castedPtr!) - case "PathAttachment": - let castedPtr = spine_attachment_cast_to_path_attachment(ptr) - return PathAttachment(fromPointer: castedPtr!) - case "PointAttachment": - let castedPtr = spine_attachment_cast_to_point_attachment(ptr) - return PointAttachment(fromPointer: castedPtr!) - case "RegionAttachment": - let castedPtr = spine_attachment_cast_to_region_attachment(ptr) - return RegionAttachment(fromPointer: castedPtr!) - default: - fatalError("Unknown concrete type: \(rttiClassName) for abstract class Attachment") - } + guard let ptr = result else { return nil } + let rtti = spine_attachment_get_rtti(ptr) + let rttiClassName = String(cString: spine_rtti_get_class_name(rtti)!) + switch rttiClassName { + case "BoundingBoxAttachment": + let castedPtr = spine_attachment_cast_to_bounding_box_attachment(ptr) + return BoundingBoxAttachment(fromPointer: castedPtr!) + case "ClippingAttachment": + let castedPtr = spine_attachment_cast_to_clipping_attachment(ptr) + return ClippingAttachment(fromPointer: castedPtr!) + case "MeshAttachment": + let castedPtr = spine_attachment_cast_to_mesh_attachment(ptr) + return MeshAttachment(fromPointer: castedPtr!) + case "PathAttachment": + let castedPtr = spine_attachment_cast_to_path_attachment(ptr) + return PathAttachment(fromPointer: castedPtr!) + case "PointAttachment": + let castedPtr = spine_attachment_cast_to_point_attachment(ptr) + return PointAttachment(fromPointer: castedPtr!) + case "RegionAttachment": + let castedPtr = spine_attachment_cast_to_region_attachment(ptr) + return RegionAttachment(fromPointer: castedPtr!) + default: + fatalError("Unknown concrete type: \(rttiClassName) for abstract class Attachment") + } } set { - spine_slot_pose_set_attachment( - _ptr.assumingMemoryBound(to: spine_slot_pose_wrapper.self), newValue?._ptr.assumingMemoryBound(to: spine_attachment_wrapper.self)) + spine_slot_pose_set_attachment(_ptr.assumingMemoryBound(to: spine_slot_pose_wrapper.self), newValue?._ptr.assumingMemoryBound(to: spine_attachment_wrapper.self)) } } @@ -114,7 +113,7 @@ public class SlotPose: NSObject { public var sequenceIndex: Int32 { get { let result = spine_slot_pose_get_sequence_index(_ptr.assumingMemoryBound(to: spine_slot_pose_wrapper.self)) - return result + return result } set { spine_slot_pose_set_sequence_index(_ptr.assumingMemoryBound(to: spine_slot_pose_wrapper.self), newValue) @@ -132,11 +131,10 @@ public class SlotPose: NSObject { } public func set(_ pose: SlotPose) { - spine_slot_pose_set( - _ptr.assumingMemoryBound(to: spine_slot_pose_wrapper.self), pose._ptr.assumingMemoryBound(to: spine_slot_pose_wrapper.self)) + spine_slot_pose_set(_ptr.assumingMemoryBound(to: spine_slot_pose_wrapper.self), pose._ptr.assumingMemoryBound(to: spine_slot_pose_wrapper.self)) } public func dispose() { spine_slot_pose_dispose(_ptr.assumingMemoryBound(to: spine_slot_pose_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/slot_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/slot_timeline.swift index 5bb14314f..8d8e50d5e 100644 --- a/spine-ios/Sources/SpineSwift/Generated/slot_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/slot_timeline.swift @@ -38,4 +38,4 @@ public protocol SlotTimeline { var rtti: Rtti { get } var slotIndex: Int32 { get set } static func rttiStatic() -> Rtti -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/spacing_mode.swift b/spine-ios/Sources/SpineSwift/Generated/spacing_mode.swift index ae99e776c..53794382b 100644 --- a/spine-ios/Sources/SpineSwift/Generated/spacing_mode.swift +++ b/spine-ios/Sources/SpineSwift/Generated/spacing_mode.swift @@ -41,4 +41,4 @@ public enum SpacingMode: Int32, CaseIterable { public static func fromValue(_ value: Int32) -> SpacingMode? { return SpacingMode(rawValue: value) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/texture_filter.swift b/spine-ios/Sources/SpineSwift/Generated/texture_filter.swift index 13238f02e..cb45cf97f 100644 --- a/spine-ios/Sources/SpineSwift/Generated/texture_filter.swift +++ b/spine-ios/Sources/SpineSwift/Generated/texture_filter.swift @@ -45,4 +45,4 @@ public enum TextureFilter: Int32, CaseIterable { public static func fromValue(_ value: Int32) -> TextureFilter? { return TextureFilter(rawValue: value) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/texture_region.swift b/spine-ios/Sources/SpineSwift/Generated/texture_region.swift index 4120c1ee3..f20ac163e 100644 --- a/spine-ios/Sources/SpineSwift/Generated/texture_region.swift +++ b/spine-ios/Sources/SpineSwift/Generated/texture_region.swift @@ -56,7 +56,7 @@ public class TextureRegion: NSObject { public var u: Float { get { let result = spine_texture_region_get_u(_ptr.assumingMemoryBound(to: spine_texture_region_wrapper.self)) - return result + return result } set { spine_texture_region_set_u(_ptr.assumingMemoryBound(to: spine_texture_region_wrapper.self), newValue) @@ -66,7 +66,7 @@ public class TextureRegion: NSObject { public var v: Float { get { let result = spine_texture_region_get_v(_ptr.assumingMemoryBound(to: spine_texture_region_wrapper.self)) - return result + return result } set { spine_texture_region_set_v(_ptr.assumingMemoryBound(to: spine_texture_region_wrapper.self), newValue) @@ -76,7 +76,7 @@ public class TextureRegion: NSObject { public var u2: Float { get { let result = spine_texture_region_get_u2(_ptr.assumingMemoryBound(to: spine_texture_region_wrapper.self)) - return result + return result } set { spine_texture_region_set_u2(_ptr.assumingMemoryBound(to: spine_texture_region_wrapper.self), newValue) @@ -86,7 +86,7 @@ public class TextureRegion: NSObject { public var v2: Float { get { let result = spine_texture_region_get_v2(_ptr.assumingMemoryBound(to: spine_texture_region_wrapper.self)) - return result + return result } set { spine_texture_region_set_v2(_ptr.assumingMemoryBound(to: spine_texture_region_wrapper.self), newValue) @@ -96,7 +96,7 @@ public class TextureRegion: NSObject { public var regionWidth: Int32 { get { let result = spine_texture_region_get_region_width(_ptr.assumingMemoryBound(to: spine_texture_region_wrapper.self)) - return result + return result } set { spine_texture_region_set_region_width(_ptr.assumingMemoryBound(to: spine_texture_region_wrapper.self), newValue) @@ -106,7 +106,7 @@ public class TextureRegion: NSObject { public var regionHeight: Int32 { get { let result = spine_texture_region_get_region_height(_ptr.assumingMemoryBound(to: spine_texture_region_wrapper.self)) - return result + return result } set { spine_texture_region_set_region_height(_ptr.assumingMemoryBound(to: spine_texture_region_wrapper.self), newValue) @@ -126,4 +126,4 @@ public class TextureRegion: NSObject { public func dispose() { spine_texture_region_dispose(_ptr.assumingMemoryBound(to: spine_texture_region_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/texture_wrap.swift b/spine-ios/Sources/SpineSwift/Generated/texture_wrap.swift index 253143be9..467c1f129 100644 --- a/spine-ios/Sources/SpineSwift/Generated/texture_wrap.swift +++ b/spine-ios/Sources/SpineSwift/Generated/texture_wrap.swift @@ -40,4 +40,4 @@ public enum TextureWrap: Int32, CaseIterable { public static func fromValue(_ value: Int32) -> TextureWrap? { return TextureWrap(rawValue: value) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/to_property.swift b/spine-ios/Sources/SpineSwift/Generated/to_property.swift index 052e6fb53..92c6fde84 100644 --- a/spine-ios/Sources/SpineSwift/Generated/to_property.swift +++ b/spine-ios/Sources/SpineSwift/Generated/to_property.swift @@ -51,7 +51,7 @@ open class ToProperty: NSObject { public var offset: Float { get { let result = spine_to_property_get__offset(_ptr.assumingMemoryBound(to: spine_to_property_wrapper.self)) - return result + return result } set { spine_to_property_set__offset(_ptr.assumingMemoryBound(to: spine_to_property_wrapper.self), newValue) @@ -61,7 +61,7 @@ open class ToProperty: NSObject { public var max: Float { get { let result = spine_to_property_get__max(_ptr.assumingMemoryBound(to: spine_to_property_wrapper.self)) - return result + return result } set { spine_to_property_set__max(_ptr.assumingMemoryBound(to: spine_to_property_wrapper.self), newValue) @@ -71,7 +71,7 @@ open class ToProperty: NSObject { public var scale: Float { get { let result = spine_to_property_get__scale(_ptr.assumingMemoryBound(to: spine_to_property_wrapper.self)) - return result + return result } set { spine_to_property_set__scale(_ptr.assumingMemoryBound(to: spine_to_property_wrapper.self), newValue) @@ -80,18 +80,13 @@ open class ToProperty: NSObject { /// Reads the mix for this property from the specified pose. public func mix(_ pose: TransformConstraintPose) -> Float { - let result = spine_to_property_mix( - _ptr.assumingMemoryBound(to: spine_to_property_wrapper.self), - pose._ptr.assumingMemoryBound(to: spine_transform_constraint_pose_wrapper.self)) + let result = spine_to_property_mix(_ptr.assumingMemoryBound(to: spine_to_property_wrapper.self), pose._ptr.assumingMemoryBound(to: spine_transform_constraint_pose_wrapper.self)) return result } /// Applies the value to this property. public func apply(_ skeleton: Skeleton, _ pose: TransformConstraintPose, _ bone: BonePose, _ value: Float, _ local: Bool, _ additive: Bool) { - spine_to_property_apply( - _ptr.assumingMemoryBound(to: spine_to_property_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self), - pose._ptr.assumingMemoryBound(to: spine_transform_constraint_pose_wrapper.self), - bone._ptr.assumingMemoryBound(to: spine_bone_pose_wrapper.self), value, local, additive) + spine_to_property_apply(_ptr.assumingMemoryBound(to: spine_to_property_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self), pose._ptr.assumingMemoryBound(to: spine_transform_constraint_pose_wrapper.self), bone._ptr.assumingMemoryBound(to: spine_bone_pose_wrapper.self), value, local, additive) } public static func rttiStatic() -> Rtti { @@ -99,4 +94,4 @@ open class ToProperty: NSObject { return Rtti(fromPointer: result!) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/to_rotate.swift b/spine-ios/Sources/SpineSwift/Generated/to_rotate.swift index 5f460604f..c56b2e320 100644 --- a/spine-ios/Sources/SpineSwift/Generated/to_rotate.swift +++ b/spine-ios/Sources/SpineSwift/Generated/to_rotate.swift @@ -49,4 +49,4 @@ public class ToRotate: ToProperty { public func dispose() { spine_to_rotate_dispose(_ptr.assumingMemoryBound(to: spine_to_rotate_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/to_scale_x.swift b/spine-ios/Sources/SpineSwift/Generated/to_scale_x.swift index 8ae1b27d2..91f295263 100644 --- a/spine-ios/Sources/SpineSwift/Generated/to_scale_x.swift +++ b/spine-ios/Sources/SpineSwift/Generated/to_scale_x.swift @@ -49,4 +49,4 @@ public class ToScaleX: ToProperty { public func dispose() { spine_to_scale_x_dispose(_ptr.assumingMemoryBound(to: spine_to_scale_x_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/to_scale_y.swift b/spine-ios/Sources/SpineSwift/Generated/to_scale_y.swift index fc03da829..6a5571fa2 100644 --- a/spine-ios/Sources/SpineSwift/Generated/to_scale_y.swift +++ b/spine-ios/Sources/SpineSwift/Generated/to_scale_y.swift @@ -49,4 +49,4 @@ public class ToScaleY: ToProperty { public func dispose() { spine_to_scale_y_dispose(_ptr.assumingMemoryBound(to: spine_to_scale_y_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/to_shear_y.swift b/spine-ios/Sources/SpineSwift/Generated/to_shear_y.swift index 0675a9e97..320c3386d 100644 --- a/spine-ios/Sources/SpineSwift/Generated/to_shear_y.swift +++ b/spine-ios/Sources/SpineSwift/Generated/to_shear_y.swift @@ -49,4 +49,4 @@ public class ToShearY: ToProperty { public func dispose() { spine_to_shear_y_dispose(_ptr.assumingMemoryBound(to: spine_to_shear_y_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/to_x.swift b/spine-ios/Sources/SpineSwift/Generated/to_x.swift index f6a4f3434..5fd6134e7 100644 --- a/spine-ios/Sources/SpineSwift/Generated/to_x.swift +++ b/spine-ios/Sources/SpineSwift/Generated/to_x.swift @@ -49,4 +49,4 @@ public class ToX: ToProperty { public func dispose() { spine_to_x_dispose(_ptr.assumingMemoryBound(to: spine_to_x_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/to_y.swift b/spine-ios/Sources/SpineSwift/Generated/to_y.swift index 5c77d0e8f..e0e7d05c7 100644 --- a/spine-ios/Sources/SpineSwift/Generated/to_y.swift +++ b/spine-ios/Sources/SpineSwift/Generated/to_y.swift @@ -49,4 +49,4 @@ public class ToY: ToProperty { public func dispose() { spine_to_y_dispose(_ptr.assumingMemoryBound(to: spine_to_y_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/track_entry.swift b/spine-ios/Sources/SpineSwift/Generated/track_entry.swift index 4ee319e19..c8dcbb882 100644 --- a/spine-ios/Sources/SpineSwift/Generated/track_entry.swift +++ b/spine-ios/Sources/SpineSwift/Generated/track_entry.swift @@ -58,11 +58,10 @@ public class TrackEntry: NSObject { public var animation: Animation { get { let result = spine_track_entry_get_animation(_ptr.assumingMemoryBound(to: spine_track_entry_wrapper.self)) - return Animation(fromPointer: result!) + return Animation(fromPointer: result!) } set { - spine_track_entry_set_animation( - _ptr.assumingMemoryBound(to: spine_track_entry_wrapper.self), newValue._ptr.assumingMemoryBound(to: spine_animation_wrapper.self)) + spine_track_entry_set_animation(_ptr.assumingMemoryBound(to: spine_track_entry_wrapper.self), newValue._ptr.assumingMemoryBound(to: spine_animation_wrapper.self)) } } @@ -76,7 +75,7 @@ public class TrackEntry: NSObject { public var loop: Bool { get { let result = spine_track_entry_get_loop(_ptr.assumingMemoryBound(to: spine_track_entry_wrapper.self)) - return result + return result } set { spine_track_entry_set_loop(_ptr.assumingMemoryBound(to: spine_track_entry_wrapper.self), newValue) @@ -92,13 +91,13 @@ public class TrackEntry: NSObject { /// from 0% to 100%. Setting holdPrevious to true applies the first animation at 100% during the /// mix so the lower track value is overwritten. Such dipping does not occur on the lowest track /// which keys the property, only when a higher track also keys the property. - /// +/// /// Snapping will occur if holdPrevious is true and this animation does not key all the same /// properties as the previous animation. public var holdPrevious: Bool { get { let result = spine_track_entry_get_hold_previous(_ptr.assumingMemoryBound(to: spine_track_entry_wrapper.self)) - return result + return result } set { spine_track_entry_set_hold_previous(_ptr.assumingMemoryBound(to: spine_track_entry_wrapper.self), newValue) @@ -108,7 +107,7 @@ public class TrackEntry: NSObject { public var reverse: Bool { get { let result = spine_track_entry_get_reverse(_ptr.assumingMemoryBound(to: spine_track_entry_wrapper.self)) - return result + return result } set { spine_track_entry_set_reverse(_ptr.assumingMemoryBound(to: spine_track_entry_wrapper.self), newValue) @@ -118,7 +117,7 @@ public class TrackEntry: NSObject { public var shortestRotation: Bool { get { let result = spine_track_entry_get_shortest_rotation(_ptr.assumingMemoryBound(to: spine_track_entry_wrapper.self)) - return result + return result } set { spine_track_entry_set_shortest_rotation(_ptr.assumingMemoryBound(to: spine_track_entry_wrapper.self), newValue) @@ -132,14 +131,14 @@ public class TrackEntry: NSObject { /// >= this track entry's delay). /// /// getTimeScale() affects the delay. - /// +/// /// When passing delay < = 0 to AnimationState::addAnimation(int, Animation, bool, float) this /// delay is set using a mix duration from AnimationStateData. To change the getMixDuration() /// afterward, use setMixDuration(float, float) so this delay is adjusted. public var delay: Float { get { let result = spine_track_entry_get_delay(_ptr.assumingMemoryBound(to: spine_track_entry_wrapper.self)) - return result + return result } set { spine_track_entry_set_delay(_ptr.assumingMemoryBound(to: spine_track_entry_wrapper.self), newValue) @@ -152,7 +151,7 @@ public class TrackEntry: NSObject { public var trackTime: Float { get { let result = spine_track_entry_get_track_time(_ptr.assumingMemoryBound(to: spine_track_entry_wrapper.self)) - return result + return result } set { spine_track_entry_set_track_time(_ptr.assumingMemoryBound(to: spine_track_entry_wrapper.self), newValue) @@ -171,7 +170,7 @@ public class TrackEntry: NSObject { public var trackEnd: Float { get { let result = spine_track_entry_get_track_end(_ptr.assumingMemoryBound(to: spine_track_entry_wrapper.self)) - return result + return result } set { spine_track_entry_set_track_end(_ptr.assumingMemoryBound(to: spine_track_entry_wrapper.self), newValue) @@ -185,7 +184,7 @@ public class TrackEntry: NSObject { public var animationStart: Float { get { let result = spine_track_entry_get_animation_start(_ptr.assumingMemoryBound(to: spine_track_entry_wrapper.self)) - return result + return result } set { spine_track_entry_set_animation_start(_ptr.assumingMemoryBound(to: spine_track_entry_wrapper.self), newValue) @@ -198,7 +197,7 @@ public class TrackEntry: NSObject { public var animationEnd: Float { get { let result = spine_track_entry_get_animation_end(_ptr.assumingMemoryBound(to: spine_track_entry_wrapper.self)) - return result + return result } set { spine_track_entry_set_animation_end(_ptr.assumingMemoryBound(to: spine_track_entry_wrapper.self), newValue) @@ -212,7 +211,7 @@ public class TrackEntry: NSObject { public var animationLast: Float { get { let result = spine_track_entry_get_animation_last(_ptr.assumingMemoryBound(to: spine_track_entry_wrapper.self)) - return result + return result } set { spine_track_entry_set_animation_last(_ptr.assumingMemoryBound(to: spine_track_entry_wrapper.self), newValue) @@ -234,19 +233,19 @@ public class TrackEntry: NSObject { /// animation to pass slower or faster. Defaults to 1. /// /// Values < 0 are not supported. To play an animation in reverse, use getReverse(). - /// +/// /// getMixTime() is not affected by track entry time scale, so getMixDuration() may need to be /// adjusted to match the animation speed. - /// +/// /// When using AnimationState::addAnimation(int, Animation, bool, float) with a delay < = 0, the /// getDelay() is set using the mix duration from the AnimationStateData, assuming time scale to /// be 1. If the time scale is not 1, the delay may need to be adjusted. - /// +/// /// See AnimationState getTimeScale() for affecting all animations. public var timeScale: Float { get { let result = spine_track_entry_get_time_scale(_ptr.assumingMemoryBound(to: spine_track_entry_wrapper.self)) - return result + return result } set { spine_track_entry_set_time_scale(_ptr.assumingMemoryBound(to: spine_track_entry_wrapper.self), newValue) @@ -262,7 +261,7 @@ public class TrackEntry: NSObject { public var alpha: Float { get { let result = spine_track_entry_get_alpha(_ptr.assumingMemoryBound(to: spine_track_entry_wrapper.self)) - return result + return result } set { spine_track_entry_set_alpha(_ptr.assumingMemoryBound(to: spine_track_entry_wrapper.self), newValue) @@ -275,7 +274,7 @@ public class TrackEntry: NSObject { public var eventThreshold: Float { get { let result = spine_track_entry_get_event_threshold(_ptr.assumingMemoryBound(to: spine_track_entry_wrapper.self)) - return result + return result } set { spine_track_entry_set_event_threshold(_ptr.assumingMemoryBound(to: spine_track_entry_wrapper.self), newValue) @@ -288,7 +287,7 @@ public class TrackEntry: NSObject { public var mixAttachmentThreshold: Float { get { let result = spine_track_entry_get_mix_attachment_threshold(_ptr.assumingMemoryBound(to: spine_track_entry_wrapper.self)) - return result + return result } set { spine_track_entry_set_mix_attachment_threshold(_ptr.assumingMemoryBound(to: spine_track_entry_wrapper.self), newValue) @@ -300,7 +299,7 @@ public class TrackEntry: NSObject { public var alphaAttachmentThreshold: Float { get { let result = spine_track_entry_get_alpha_attachment_threshold(_ptr.assumingMemoryBound(to: spine_track_entry_wrapper.self)) - return result + return result } set { spine_track_entry_set_alpha_attachment_threshold(_ptr.assumingMemoryBound(to: spine_track_entry_wrapper.self), newValue) @@ -313,7 +312,7 @@ public class TrackEntry: NSObject { public var mixDrawOrderThreshold: Float { get { let result = spine_track_entry_get_mix_draw_order_threshold(_ptr.assumingMemoryBound(to: spine_track_entry_wrapper.self)) - return result + return result } set { spine_track_entry_set_mix_draw_order_threshold(_ptr.assumingMemoryBound(to: spine_track_entry_wrapper.self), newValue) @@ -337,7 +336,7 @@ public class TrackEntry: NSObject { public var mixTime: Float { get { let result = spine_track_entry_get_mix_time(_ptr.assumingMemoryBound(to: spine_track_entry_wrapper.self)) - return result + return result } set { spine_track_entry_set_mix_time(_ptr.assumingMemoryBound(to: spine_track_entry_wrapper.self), newValue) @@ -350,7 +349,7 @@ public class TrackEntry: NSObject { /// The mix duration can be set manually rather than use the value from /// AnimationStateData.GetMix. In that case, the mixDuration must be set before /// AnimationState.update(float) is next called. - /// +/// /// When using AnimationState::addAnimation(int, Animation, bool, float) with a delay less than /// or equal to 0, note the Delay is set using the mix duration from the AnimationStateData public var mixDuration: Float { @@ -361,11 +360,10 @@ public class TrackEntry: NSObject { public var mixBlend: MixBlend { get { let result = spine_track_entry_get_mix_blend(_ptr.assumingMemoryBound(to: spine_track_entry_wrapper.self)) - return MixBlend(rawValue: Int32(result.rawValue))! + return MixBlend(rawValue: Int32(result.rawValue))! } set { - spine_track_entry_set_mix_blend( - _ptr.assumingMemoryBound(to: spine_track_entry_wrapper.self), spine_mix_blend(rawValue: UInt32(newValue.rawValue))) + spine_track_entry_set_mix_blend(_ptr.assumingMemoryBound(to: spine_track_entry_wrapper.self), spine_mix_blend(rawValue: UInt32(newValue.rawValue))) } } @@ -416,12 +414,10 @@ public class TrackEntry: NSObject { public var animationState: AnimationState? { get { let result = spine_track_entry_get_animation_state(_ptr.assumingMemoryBound(to: spine_track_entry_wrapper.self)) - return result.map { AnimationState(fromPointer: $0) } + return result.map { AnimationState(fromPointer: $0) } } set { - spine_track_entry_set_animation_state( - _ptr.assumingMemoryBound(to: spine_track_entry_wrapper.self), - newValue?._ptr.assumingMemoryBound(to: spine_animation_state_wrapper.self)) + spine_track_entry_set_animation_state(_ptr.assumingMemoryBound(to: spine_track_entry_wrapper.self), newValue?._ptr.assumingMemoryBound(to: spine_animation_state_wrapper.self)) } } @@ -460,4 +456,4 @@ public class TrackEntry: NSObject { public func dispose() { spine_track_entry_dispose(_ptr.assumingMemoryBound(to: spine_track_entry_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/transform_constraint.swift b/spine-ios/Sources/SpineSwift/Generated/transform_constraint.swift index 161d34621..c0d914736 100644 --- a/spine-ios/Sources/SpineSwift/Generated/transform_constraint.swift +++ b/spine-ios/Sources/SpineSwift/Generated/transform_constraint.swift @@ -42,9 +42,7 @@ public class TransformConstraint: TransformConstraintBase { } public convenience init(_ data: TransformConstraintData, _ skeleton: Skeleton) { - let ptr = spine_transform_constraint_create( - data._ptr.assumingMemoryBound(to: spine_transform_constraint_data_wrapper.self), - skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) + let ptr = spine_transform_constraint_create(data._ptr.assumingMemoryBound(to: spine_transform_constraint_data_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) self.init(fromPointer: ptr!) } @@ -58,21 +56,19 @@ public class TransformConstraint: TransformConstraintBase { public var source: Bone { get { let result = spine_transform_constraint_get_source(_ptr.assumingMemoryBound(to: spine_transform_constraint_wrapper.self)) - return Bone(fromPointer: result!) + return Bone(fromPointer: result!) } set { - spine_transform_constraint_set_source( - _ptr.assumingMemoryBound(to: spine_transform_constraint_wrapper.self), newValue._ptr.assumingMemoryBound(to: spine_bone_wrapper.self)) + spine_transform_constraint_set_source(_ptr.assumingMemoryBound(to: spine_transform_constraint_wrapper.self), newValue._ptr.assumingMemoryBound(to: spine_bone_wrapper.self)) } } public func copyAttachment(_ skeleton: Skeleton) -> TransformConstraint { - let result = spine_transform_constraint_copy( - _ptr.assumingMemoryBound(to: spine_transform_constraint_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) + let result = spine_transform_constraint_copy(_ptr.assumingMemoryBound(to: spine_transform_constraint_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) return TransformConstraint(fromPointer: result!) } public override func dispose() { spine_transform_constraint_dispose(_ptr.assumingMemoryBound(to: spine_transform_constraint_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/transform_constraint_base.swift b/spine-ios/Sources/SpineSwift/Generated/transform_constraint_base.swift index 35b02d2fd..4ab26237f 100644 --- a/spine-ios/Sources/SpineSwift/Generated/transform_constraint_base.swift +++ b/spine-ios/Sources/SpineSwift/Generated/transform_constraint_base.swift @@ -57,8 +57,7 @@ open class TransformConstraintBase: PosedActive, Posed, Constraint { } public var isPoseEqualToApplied: Bool { - let result = spine_transform_constraint_base_is_pose_equal_to_applied( - _ptr.assumingMemoryBound(to: spine_transform_constraint_base_wrapper.self)) + let result = spine_transform_constraint_base_is_pose_equal_to_applied(_ptr.assumingMemoryBound(to: spine_transform_constraint_base_wrapper.self)) return result } @@ -81,16 +80,12 @@ open class TransformConstraintBase: PosedActive, Posed, Constraint { } public func sort(_ skeleton: Skeleton) { - spine_transform_constraint_base_sort( - _ptr.assumingMemoryBound(to: spine_transform_constraint_base_wrapper.self), - skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) + spine_transform_constraint_base_sort(_ptr.assumingMemoryBound(to: spine_transform_constraint_base_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self)) } /// Inherited from Update public func update(_ skeleton: Skeleton, _ physics: Physics) { - spine_transform_constraint_base_update( - _ptr.assumingMemoryBound(to: spine_transform_constraint_base_wrapper.self), - skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self), spine_physics(rawValue: UInt32(physics.rawValue))) + spine_transform_constraint_base_update(_ptr.assumingMemoryBound(to: spine_transform_constraint_base_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self), spine_physics(rawValue: UInt32(physics.rawValue))) } public static func rttiStatic() -> Rtti { @@ -98,4 +93,4 @@ open class TransformConstraintBase: PosedActive, Posed, Constraint { return Rtti(fromPointer: result!) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/transform_constraint_data.swift b/spine-ios/Sources/SpineSwift/Generated/transform_constraint_data.swift index 2d47564b1..0b958e8ae 100644 --- a/spine-ios/Sources/SpineSwift/Generated/transform_constraint_data.swift +++ b/spine-ios/Sources/SpineSwift/Generated/transform_constraint_data.swift @@ -64,21 +64,18 @@ public class TransformConstraintData: PosedData, ConstraintData { public var source: BoneData { get { let result = spine_transform_constraint_data_get_source(_ptr.assumingMemoryBound(to: spine_transform_constraint_data_wrapper.self)) - return BoneData(fromPointer: result!) + return BoneData(fromPointer: result!) } set { - spine_transform_constraint_data_set_source( - _ptr.assumingMemoryBound(to: spine_transform_constraint_data_wrapper.self), - newValue._ptr.assumingMemoryBound(to: spine_bone_data_wrapper.self)) + spine_transform_constraint_data_set_source(_ptr.assumingMemoryBound(to: spine_transform_constraint_data_wrapper.self), newValue._ptr.assumingMemoryBound(to: spine_bone_data_wrapper.self)) } } /// An offset added to the constrained bone rotation. public var offsetRotation: Float { get { - let result = spine_transform_constraint_data_get_offset_rotation( - _ptr.assumingMemoryBound(to: spine_transform_constraint_data_wrapper.self)) - return result + let result = spine_transform_constraint_data_get_offset_rotation(_ptr.assumingMemoryBound(to: spine_transform_constraint_data_wrapper.self)) + return result } set { spine_transform_constraint_data_set_offset_rotation(_ptr.assumingMemoryBound(to: spine_transform_constraint_data_wrapper.self), newValue) @@ -89,7 +86,7 @@ public class TransformConstraintData: PosedData, ConstraintData { public var offsetX: Float { get { let result = spine_transform_constraint_data_get_offset_x(_ptr.assumingMemoryBound(to: spine_transform_constraint_data_wrapper.self)) - return result + return result } set { spine_transform_constraint_data_set_offset_x(_ptr.assumingMemoryBound(to: spine_transform_constraint_data_wrapper.self), newValue) @@ -100,7 +97,7 @@ public class TransformConstraintData: PosedData, ConstraintData { public var offsetY: Float { get { let result = spine_transform_constraint_data_get_offset_y(_ptr.assumingMemoryBound(to: spine_transform_constraint_data_wrapper.self)) - return result + return result } set { spine_transform_constraint_data_set_offset_y(_ptr.assumingMemoryBound(to: spine_transform_constraint_data_wrapper.self), newValue) @@ -110,9 +107,8 @@ public class TransformConstraintData: PosedData, ConstraintData { /// An offset added to the constrained bone scaleX. public var offsetScaleX: Float { get { - let result = spine_transform_constraint_data_get_offset_scale_x( - _ptr.assumingMemoryBound(to: spine_transform_constraint_data_wrapper.self)) - return result + let result = spine_transform_constraint_data_get_offset_scale_x(_ptr.assumingMemoryBound(to: spine_transform_constraint_data_wrapper.self)) + return result } set { spine_transform_constraint_data_set_offset_scale_x(_ptr.assumingMemoryBound(to: spine_transform_constraint_data_wrapper.self), newValue) @@ -122,9 +118,8 @@ public class TransformConstraintData: PosedData, ConstraintData { /// An offset added to the constrained bone scaleY. public var offsetScaleY: Float { get { - let result = spine_transform_constraint_data_get_offset_scale_y( - _ptr.assumingMemoryBound(to: spine_transform_constraint_data_wrapper.self)) - return result + let result = spine_transform_constraint_data_get_offset_scale_y(_ptr.assumingMemoryBound(to: spine_transform_constraint_data_wrapper.self)) + return result } set { spine_transform_constraint_data_set_offset_scale_y(_ptr.assumingMemoryBound(to: spine_transform_constraint_data_wrapper.self), newValue) @@ -134,9 +129,8 @@ public class TransformConstraintData: PosedData, ConstraintData { /// An offset added to the constrained bone shearY. public var offsetShearY: Float { get { - let result = spine_transform_constraint_data_get_offset_shear_y( - _ptr.assumingMemoryBound(to: spine_transform_constraint_data_wrapper.self)) - return result + let result = spine_transform_constraint_data_get_offset_shear_y(_ptr.assumingMemoryBound(to: spine_transform_constraint_data_wrapper.self)) + return result } set { spine_transform_constraint_data_set_offset_shear_y(_ptr.assumingMemoryBound(to: spine_transform_constraint_data_wrapper.self), newValue) @@ -147,7 +141,7 @@ public class TransformConstraintData: PosedData, ConstraintData { public var localSource: Bool { get { let result = spine_transform_constraint_data_get_local_source(_ptr.assumingMemoryBound(to: spine_transform_constraint_data_wrapper.self)) - return result + return result } set { spine_transform_constraint_data_set_local_source(_ptr.assumingMemoryBound(to: spine_transform_constraint_data_wrapper.self), newValue) @@ -158,7 +152,7 @@ public class TransformConstraintData: PosedData, ConstraintData { public var localTarget: Bool { get { let result = spine_transform_constraint_data_get_local_target(_ptr.assumingMemoryBound(to: spine_transform_constraint_data_wrapper.self)) - return result + return result } set { spine_transform_constraint_data_set_local_target(_ptr.assumingMemoryBound(to: spine_transform_constraint_data_wrapper.self), newValue) @@ -169,7 +163,7 @@ public class TransformConstraintData: PosedData, ConstraintData { public var additive: Bool { get { let result = spine_transform_constraint_data_get_additive(_ptr.assumingMemoryBound(to: spine_transform_constraint_data_wrapper.self)) - return result + return result } set { spine_transform_constraint_data_set_additive(_ptr.assumingMemoryBound(to: spine_transform_constraint_data_wrapper.self), newValue) @@ -180,7 +174,7 @@ public class TransformConstraintData: PosedData, ConstraintData { public var clamp: Bool { get { let result = spine_transform_constraint_data_get_clamp(_ptr.assumingMemoryBound(to: spine_transform_constraint_data_wrapper.self)) - return result + return result } set { spine_transform_constraint_data_set_clamp(_ptr.assumingMemoryBound(to: spine_transform_constraint_data_wrapper.self), newValue) @@ -199,9 +193,7 @@ 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 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 rttiClassName = String(cString: spine_rtti_get_class_name(rtti)!) switch rttiClassName { @@ -233,4 +225,4 @@ public class TransformConstraintData: PosedData, ConstraintData { public override func dispose() { spine_transform_constraint_data_dispose(_ptr.assumingMemoryBound(to: spine_transform_constraint_data_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/transform_constraint_pose.swift b/spine-ios/Sources/SpineSwift/Generated/transform_constraint_pose.swift index c9d34e71b..cdc0d0a49 100644 --- a/spine-ios/Sources/SpineSwift/Generated/transform_constraint_pose.swift +++ b/spine-ios/Sources/SpineSwift/Generated/transform_constraint_pose.swift @@ -52,7 +52,7 @@ public class TransformConstraintPose: NSObject { public var mixRotate: Float { get { let result = spine_transform_constraint_pose_get_mix_rotate(_ptr.assumingMemoryBound(to: spine_transform_constraint_pose_wrapper.self)) - return result + return result } set { spine_transform_constraint_pose_set_mix_rotate(_ptr.assumingMemoryBound(to: spine_transform_constraint_pose_wrapper.self), newValue) @@ -64,7 +64,7 @@ public class TransformConstraintPose: NSObject { public var mixX: Float { get { let result = spine_transform_constraint_pose_get_mix_x(_ptr.assumingMemoryBound(to: spine_transform_constraint_pose_wrapper.self)) - return result + return result } set { spine_transform_constraint_pose_set_mix_x(_ptr.assumingMemoryBound(to: spine_transform_constraint_pose_wrapper.self), newValue) @@ -76,7 +76,7 @@ public class TransformConstraintPose: NSObject { public var mixY: Float { get { let result = spine_transform_constraint_pose_get_mix_y(_ptr.assumingMemoryBound(to: spine_transform_constraint_pose_wrapper.self)) - return result + return result } set { spine_transform_constraint_pose_set_mix_y(_ptr.assumingMemoryBound(to: spine_transform_constraint_pose_wrapper.self), newValue) @@ -87,7 +87,7 @@ public class TransformConstraintPose: NSObject { public var mixScaleX: Float { get { let result = spine_transform_constraint_pose_get_mix_scale_x(_ptr.assumingMemoryBound(to: spine_transform_constraint_pose_wrapper.self)) - return result + return result } set { spine_transform_constraint_pose_set_mix_scale_x(_ptr.assumingMemoryBound(to: spine_transform_constraint_pose_wrapper.self), newValue) @@ -98,7 +98,7 @@ public class TransformConstraintPose: NSObject { public var mixScaleY: Float { get { let result = spine_transform_constraint_pose_get_mix_scale_y(_ptr.assumingMemoryBound(to: spine_transform_constraint_pose_wrapper.self)) - return result + return result } set { spine_transform_constraint_pose_set_mix_scale_y(_ptr.assumingMemoryBound(to: spine_transform_constraint_pose_wrapper.self), newValue) @@ -109,7 +109,7 @@ public class TransformConstraintPose: NSObject { public var mixShearY: Float { get { let result = spine_transform_constraint_pose_get_mix_shear_y(_ptr.assumingMemoryBound(to: spine_transform_constraint_pose_wrapper.self)) - return result + return result } set { spine_transform_constraint_pose_set_mix_shear_y(_ptr.assumingMemoryBound(to: spine_transform_constraint_pose_wrapper.self), newValue) @@ -117,12 +117,10 @@ public class TransformConstraintPose: NSObject { } public func set(_ pose: TransformConstraintPose) { - spine_transform_constraint_pose_set( - _ptr.assumingMemoryBound(to: spine_transform_constraint_pose_wrapper.self), - pose._ptr.assumingMemoryBound(to: spine_transform_constraint_pose_wrapper.self)) + spine_transform_constraint_pose_set(_ptr.assumingMemoryBound(to: spine_transform_constraint_pose_wrapper.self), pose._ptr.assumingMemoryBound(to: spine_transform_constraint_pose_wrapper.self)) } public func dispose() { spine_transform_constraint_pose_dispose(_ptr.assumingMemoryBound(to: spine_transform_constraint_pose_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/transform_constraint_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/transform_constraint_timeline.swift index 0b13b693f..6a8a710c1 100644 --- a/spine-ios/Sources/SpineSwift/Generated/transform_constraint_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/transform_constraint_timeline.swift @@ -51,13 +51,11 @@ public class TransformConstraintTimeline: CurveTimeline, ConstraintTimeline { public var constraintIndex: Int32 { get { - let result = spine_transform_constraint_timeline_get_constraint_index( - _ptr.assumingMemoryBound(to: spine_transform_constraint_timeline_wrapper.self)) - return result + let result = spine_transform_constraint_timeline_get_constraint_index(_ptr.assumingMemoryBound(to: spine_transform_constraint_timeline_wrapper.self)) + return result } set { - spine_transform_constraint_timeline_set_constraint_index( - _ptr.assumingMemoryBound(to: spine_transform_constraint_timeline_wrapper.self), newValue) + spine_transform_constraint_timeline_set_constraint_index(_ptr.assumingMemoryBound(to: spine_transform_constraint_timeline_wrapper.self), newValue) } } @@ -65,15 +63,11 @@ public class TransformConstraintTimeline: CurveTimeline, ConstraintTimeline { /// /// - Parameter frame: Between 0 and frameCount, inclusive. /// - Parameter time: The frame time in seconds. - public func setFrame( - _ frame: Int32, _ time: Float, _ mixRotate: Float, _ mixX: Float, _ mixY: Float, _ mixScaleX: Float, _ mixScaleY: Float, _ mixShearY: Float - ) { - spine_transform_constraint_timeline_set_frame( - _ptr.assumingMemoryBound(to: spine_transform_constraint_timeline_wrapper.self), frame, time, mixRotate, mixX, mixY, mixScaleX, mixScaleY, - mixShearY) + public func setFrame(_ frame: Int32, _ time: Float, _ mixRotate: Float, _ mixX: Float, _ mixY: Float, _ mixScaleX: Float, _ mixScaleY: Float, _ mixShearY: Float) { + spine_transform_constraint_timeline_set_frame(_ptr.assumingMemoryBound(to: spine_transform_constraint_timeline_wrapper.self), frame, time, mixRotate, mixX, mixY, mixScaleX, mixScaleY, mixShearY) } public func dispose() { spine_transform_constraint_timeline_dispose(_ptr.assumingMemoryBound(to: spine_transform_constraint_timeline_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/translate_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/translate_timeline.swift index 753c13364..e34694544 100644 --- a/spine-ios/Sources/SpineSwift/Generated/translate_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/translate_timeline.swift @@ -49,4 +49,4 @@ public class TranslateTimeline: BoneTimeline2 { public func dispose() { spine_translate_timeline_dispose(_ptr.assumingMemoryBound(to: spine_translate_timeline_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/translate_x_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/translate_x_timeline.swift index 38b363232..806f2791f 100644 --- a/spine-ios/Sources/SpineSwift/Generated/translate_x_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/translate_x_timeline.swift @@ -49,4 +49,4 @@ public class TranslateXTimeline: BoneTimeline1 { public func dispose() { spine_translate_x_timeline_dispose(_ptr.assumingMemoryBound(to: spine_translate_x_timeline_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/translate_y_timeline.swift b/spine-ios/Sources/SpineSwift/Generated/translate_y_timeline.swift index 7bff08004..dc51b4b06 100644 --- a/spine-ios/Sources/SpineSwift/Generated/translate_y_timeline.swift +++ b/spine-ios/Sources/SpineSwift/Generated/translate_y_timeline.swift @@ -49,4 +49,4 @@ public class TranslateYTimeline: BoneTimeline1 { public func dispose() { spine_translate_y_timeline_dispose(_ptr.assumingMemoryBound(to: spine_translate_y_timeline_wrapper.self)) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineSwift/Generated/vertex_attachment.swift b/spine-ios/Sources/SpineSwift/Generated/vertex_attachment.swift index 0099ac487..86be0063b 100644 --- a/spine-ios/Sources/SpineSwift/Generated/vertex_attachment.swift +++ b/spine-ios/Sources/SpineSwift/Generated/vertex_attachment.swift @@ -51,31 +51,27 @@ open class VertexAttachment: Attachment { public var bones: ArrayInt { get { let result = spine_vertex_attachment_get_bones(_ptr.assumingMemoryBound(to: spine_vertex_attachment_wrapper.self)) - return ArrayInt(fromPointer: result!) + return ArrayInt(fromPointer: result!) } set { - spine_vertex_attachment_set_bones( - _ptr.assumingMemoryBound(to: spine_vertex_attachment_wrapper.self), - newValue._ptr.assumingMemoryBound(to: spine_array_int_wrapper.self)) + spine_vertex_attachment_set_bones(_ptr.assumingMemoryBound(to: spine_vertex_attachment_wrapper.self), newValue._ptr.assumingMemoryBound(to: spine_array_int_wrapper.self)) } } public var vertices: ArrayFloat { get { let result = spine_vertex_attachment_get_vertices(_ptr.assumingMemoryBound(to: spine_vertex_attachment_wrapper.self)) - return ArrayFloat(fromPointer: result!) + return ArrayFloat(fromPointer: result!) } set { - spine_vertex_attachment_set_vertices( - _ptr.assumingMemoryBound(to: spine_vertex_attachment_wrapper.self), - newValue._ptr.assumingMemoryBound(to: spine_array_float_wrapper.self)) + spine_vertex_attachment_set_vertices(_ptr.assumingMemoryBound(to: spine_vertex_attachment_wrapper.self), newValue._ptr.assumingMemoryBound(to: spine_array_float_wrapper.self)) } } public var worldVerticesLength: Int { get { let result = spine_vertex_attachment_get_world_vertices_length(_ptr.assumingMemoryBound(to: spine_vertex_attachment_wrapper.self)) - return result + return result } set { spine_vertex_attachment_set_world_vertices_length(_ptr.assumingMemoryBound(to: spine_vertex_attachment_wrapper.self), newValue) @@ -85,52 +81,43 @@ open class VertexAttachment: Attachment { public var timelineAttachment: Attachment? { get { 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 rttiClassName = String(cString: spine_rtti_get_class_name(rtti)!) - switch rttiClassName { - case "BoundingBoxAttachment": - let castedPtr = spine_attachment_cast_to_bounding_box_attachment(ptr) - return BoundingBoxAttachment(fromPointer: castedPtr!) - case "ClippingAttachment": - let castedPtr = spine_attachment_cast_to_clipping_attachment(ptr) - return ClippingAttachment(fromPointer: castedPtr!) - case "MeshAttachment": - let castedPtr = spine_attachment_cast_to_mesh_attachment(ptr) - return MeshAttachment(fromPointer: castedPtr!) - case "PathAttachment": - let castedPtr = spine_attachment_cast_to_path_attachment(ptr) - return PathAttachment(fromPointer: castedPtr!) - case "PointAttachment": - let castedPtr = spine_attachment_cast_to_point_attachment(ptr) - return PointAttachment(fromPointer: castedPtr!) - case "RegionAttachment": - let castedPtr = spine_attachment_cast_to_region_attachment(ptr) - return RegionAttachment(fromPointer: castedPtr!) - default: - fatalError("Unknown concrete type: \(rttiClassName) for abstract class Attachment") - } + guard let ptr = result else { return nil } + let rtti = spine_attachment_get_rtti(ptr) + let rttiClassName = String(cString: spine_rtti_get_class_name(rtti)!) + switch rttiClassName { + case "BoundingBoxAttachment": + let castedPtr = spine_attachment_cast_to_bounding_box_attachment(ptr) + return BoundingBoxAttachment(fromPointer: castedPtr!) + case "ClippingAttachment": + let castedPtr = spine_attachment_cast_to_clipping_attachment(ptr) + return ClippingAttachment(fromPointer: castedPtr!) + case "MeshAttachment": + let castedPtr = spine_attachment_cast_to_mesh_attachment(ptr) + return MeshAttachment(fromPointer: castedPtr!) + case "PathAttachment": + let castedPtr = spine_attachment_cast_to_path_attachment(ptr) + return PathAttachment(fromPointer: castedPtr!) + case "PointAttachment": + let castedPtr = spine_attachment_cast_to_point_attachment(ptr) + return PointAttachment(fromPointer: castedPtr!) + case "RegionAttachment": + let castedPtr = spine_attachment_cast_to_region_attachment(ptr) + return RegionAttachment(fromPointer: castedPtr!) + default: + fatalError("Unknown concrete type: \(rttiClassName) for abstract class Attachment") + } } set { - spine_vertex_attachment_set_timeline_attachment( - _ptr.assumingMemoryBound(to: spine_vertex_attachment_wrapper.self), - newValue?._ptr.assumingMemoryBound(to: spine_attachment_wrapper.self)) + spine_vertex_attachment_set_timeline_attachment(_ptr.assumingMemoryBound(to: spine_vertex_attachment_wrapper.self), newValue?._ptr.assumingMemoryBound(to: spine_attachment_wrapper.self)) } } public func copyTo(_ other: VertexAttachment) { - spine_vertex_attachment_copy_to( - _ptr.assumingMemoryBound(to: spine_vertex_attachment_wrapper.self), - other._ptr.assumingMemoryBound(to: spine_vertex_attachment_wrapper.self)) + spine_vertex_attachment_copy_to(_ptr.assumingMemoryBound(to: spine_vertex_attachment_wrapper.self), other._ptr.assumingMemoryBound(to: spine_vertex_attachment_wrapper.self)) } - public func computeWorldVertices( - _ skeleton: Skeleton, _ slot: Slot, _ start: Int, _ count: Int, _ worldVertices: ArrayFloat, _ offset: Int, _ stride: Int - ) { - spine_vertex_attachment_compute_world_vertices_2( - _ptr.assumingMemoryBound(to: spine_vertex_attachment_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self), - slot._ptr.assumingMemoryBound(to: spine_slot_wrapper.self), start, count, - worldVertices._ptr.assumingMemoryBound(to: spine_array_float_wrapper.self), offset, stride) + public func computeWorldVertices(_ skeleton: Skeleton, _ slot: Slot, _ start: Int, _ count: Int, _ worldVertices: ArrayFloat, _ offset: Int, _ stride: Int) { + spine_vertex_attachment_compute_world_vertices_2(_ptr.assumingMemoryBound(to: spine_vertex_attachment_wrapper.self), skeleton._ptr.assumingMemoryBound(to: spine_skeleton_wrapper.self), slot._ptr.assumingMemoryBound(to: spine_slot_wrapper.self), start, count, worldVertices._ptr.assumingMemoryBound(to: spine_array_float_wrapper.self), offset, stride) } -} +} \ No newline at end of file diff --git a/spine-ios/Sources/SpineiOS/Extensions/SkeletonDrawableWrapper+CGImage.swift b/spine-ios/Sources/SpineiOS/Extensions/SkeletonDrawableWrapper+CGImage.swift index 4a7ae5cef..710185683 100644 --- a/spine-ios/Sources/SpineiOS/Extensions/SkeletonDrawableWrapper+CGImage.swift +++ b/spine-ios/Sources/SpineiOS/Extensions/SkeletonDrawableWrapper+CGImage.swift @@ -48,8 +48,9 @@ import Foundation backgroundColor: UIColor, scaleFactor: CGFloat = 1 ) throws -> CGImage? { + let controller = SpineController(disposeDrawableOnDeInit: false) // Doesn't own the drawable let spineView = SpineUIView( - controller: SpineController(disposeDrawableOnDeInit: false), // Doesn't own the drawable + controller: controller, boundsProvider: boundsProvider, backgroundColor: backgroundColor ) @@ -59,6 +60,12 @@ import Foundation spineView.framebufferOnly = false spineView.contentScaleFactor = scaleFactor + defer { + controller.drawable = nil + spineView.delegate = nil + spineView.renderer = nil + } + try spineView.load(drawable: self) spineView.renderer?.waitUntilCompleted = true diff --git a/spine-ios/codegen/package-lock.json b/spine-ios/codegen/package-lock.json index bee2a9a26..c18b01ee6 100644 --- a/spine-ios/codegen/package-lock.json +++ b/spine-ios/codegen/package-lock.json @@ -25,6 +25,74 @@ "typescript-formatter": "^7.2.2" } }, + "node_modules/@esbuild/aix-ppc64": { + "version": "0.25.8", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.8.tgz", + "integrity": "sha512-urAvrUedIqEiFR3FYSLTWQgLu5tb+m0qZw0NBEasUeo6wuqatkMDaRT+1uABiGXEu5vqgPd7FGE1BhsAIy9QVA==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "aix" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/android-arm": { + "version": "0.25.8", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.8.tgz", + "integrity": "sha512-RONsAvGCz5oWyePVnLdZY/HHwA++nxYWIX1atInlaW6SEkwq6XkP3+cb825EUcRs5Vss/lGh/2YxAb5xqc07Uw==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/android-arm64": { + "version": "0.25.8", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.8.tgz", + "integrity": "sha512-OD3p7LYzWpLhZEyATcTSJ67qB5D+20vbtr6vHlHWSQYhKtzUYrETuWThmzFpZtFsBIxRvhO07+UgVA9m0i/O1w==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/android-x64": { + "version": "0.25.8", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.8.tgz", + "integrity": "sha512-yJAVPklM5+4+9dTeKwHOaA+LQkmrKFX96BM0A/2zQrbS6ENCmxc4OVoBs5dPkCCak2roAD+jKCdnmOqKszPkjA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, "node_modules/@esbuild/darwin-arm64": { "version": "0.25.8", "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.8.tgz", @@ -42,6 +110,363 @@ "node": ">=18" } }, + "node_modules/@esbuild/darwin-x64": { + "version": "0.25.8", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.8.tgz", + "integrity": "sha512-Vh2gLxxHnuoQ+GjPNvDSDRpoBCUzY4Pu0kBqMBDlK4fuWbKgGtmDIeEC081xi26PPjn+1tct+Bh8FjyLlw1Zlg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/freebsd-arm64": { + "version": "0.25.8", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.8.tgz", + "integrity": "sha512-YPJ7hDQ9DnNe5vxOm6jaie9QsTwcKedPvizTVlqWG9GBSq+BuyWEDazlGaDTC5NGU4QJd666V0yqCBL2oWKPfA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/freebsd-x64": { + "version": "0.25.8", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.8.tgz", + "integrity": "sha512-MmaEXxQRdXNFsRN/KcIimLnSJrk2r5H8v+WVafRWz5xdSVmWLoITZQXcgehI2ZE6gioE6HirAEToM/RvFBeuhw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-arm": { + "version": "0.25.8", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.8.tgz", + "integrity": "sha512-FuzEP9BixzZohl1kLf76KEVOsxtIBFwCaLupVuk4eFVnOZfU+Wsn+x5Ryam7nILV2pkq2TqQM9EZPsOBuMC+kg==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-arm64": { + "version": "0.25.8", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.8.tgz", + "integrity": "sha512-WIgg00ARWv/uYLU7lsuDK00d/hHSfES5BzdWAdAig1ioV5kaFNrtK8EqGcUBJhYqotlUByUKz5Qo6u8tt7iD/w==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-ia32": { + "version": "0.25.8", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.8.tgz", + "integrity": "sha512-A1D9YzRX1i+1AJZuFFUMP1E9fMaYY+GnSQil9Tlw05utlE86EKTUA7RjwHDkEitmLYiFsRd9HwKBPEftNdBfjg==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-loong64": { + "version": "0.25.8", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.8.tgz", + "integrity": "sha512-O7k1J/dwHkY1RMVvglFHl1HzutGEFFZ3kNiDMSOyUrB7WcoHGf96Sh+64nTRT26l3GMbCW01Ekh/ThKM5iI7hQ==", + "cpu": [ + "loong64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-mips64el": { + "version": "0.25.8", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.8.tgz", + "integrity": "sha512-uv+dqfRazte3BzfMp8PAQXmdGHQt2oC/y2ovwpTteqrMx2lwaksiFZ/bdkXJC19ttTvNXBuWH53zy/aTj1FgGw==", + "cpu": [ + "mips64el" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-ppc64": { + "version": "0.25.8", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.8.tgz", + "integrity": "sha512-GyG0KcMi1GBavP5JgAkkstMGyMholMDybAf8wF5A70CALlDM2p/f7YFE7H92eDeH/VBtFJA5MT4nRPDGg4JuzQ==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-riscv64": { + "version": "0.25.8", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.8.tgz", + "integrity": "sha512-rAqDYFv3yzMrq7GIcen3XP7TUEG/4LK86LUPMIz6RT8A6pRIDn0sDcvjudVZBiiTcZCY9y2SgYX2lgK3AF+1eg==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-s390x": { + "version": "0.25.8", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.8.tgz", + "integrity": "sha512-Xutvh6VjlbcHpsIIbwY8GVRbwoviWT19tFhgdA7DlenLGC/mbc3lBoVb7jxj9Z+eyGqvcnSyIltYUrkKzWqSvg==", + "cpu": [ + "s390x" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-x64": { + "version": "0.25.8", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.8.tgz", + "integrity": "sha512-ASFQhgY4ElXh3nDcOMTkQero4b1lgubskNlhIfJrsH5OKZXDpUAKBlNS0Kx81jwOBp+HCeZqmoJuihTv57/jvQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/netbsd-arm64": { + "version": "0.25.8", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.8.tgz", + "integrity": "sha512-d1KfruIeohqAi6SA+gENMuObDbEjn22olAR7egqnkCD9DGBG0wsEARotkLgXDu6c4ncgWTZJtN5vcgxzWRMzcw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/netbsd-x64": { + "version": "0.25.8", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.8.tgz", + "integrity": "sha512-nVDCkrvx2ua+XQNyfrujIG38+YGyuy2Ru9kKVNyh5jAys6n+l44tTtToqHjino2My8VAY6Lw9H7RI73XFi66Cg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/openbsd-arm64": { + "version": "0.25.8", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.8.tgz", + "integrity": "sha512-j8HgrDuSJFAujkivSMSfPQSAa5Fxbvk4rgNAS5i3K+r8s1X0p1uOO2Hl2xNsGFppOeHOLAVgYwDVlmxhq5h+SQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/openbsd-x64": { + "version": "0.25.8", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.8.tgz", + "integrity": "sha512-1h8MUAwa0VhNCDp6Af0HToI2TJFAn1uqT9Al6DJVzdIBAd21m/G0Yfc77KDM3uF3T/YaOgQq3qTJHPbTOInaIQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/openharmony-arm64": { + "version": "0.25.8", + "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.8.tgz", + "integrity": "sha512-r2nVa5SIK9tSWd0kJd9HCffnDHKchTGikb//9c7HX+r+wHYCpQrSgxhlY6KWV1nFo1l4KFbsMlHk+L6fekLsUg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openharmony" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/sunos-x64": { + "version": "0.25.8", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.8.tgz", + "integrity": "sha512-zUlaP2S12YhQ2UzUfcCuMDHQFJyKABkAjvO5YSndMiIkMimPmxA+BYSBikWgsRpvyxuRnow4nS5NPnf9fpv41w==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/win32-arm64": { + "version": "0.25.8", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.8.tgz", + "integrity": "sha512-YEGFFWESlPva8hGL+zvj2z/SaK+pH0SwOM0Nc/d+rVnW7GSTFlLBGzZkuSU9kFIGIo8q9X3ucpZhu8PDN5A2sQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/win32-ia32": { + "version": "0.25.8", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.8.tgz", + "integrity": "sha512-hiGgGC6KZ5LZz58OL/+qVVoZiuZlUYlYHNAmczOm7bs2oE1XriPFi5ZHHrS8ACpV5EjySrnoCKmcbQMN+ojnHg==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/win32-x64": { + "version": "0.25.8", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.8.tgz", + "integrity": "sha512-cn3Yr7+OaaZq1c+2pe+8yxC8E144SReCQjN6/2ynubzYjvyqZjTXfQJpAcQpsdJq3My7XADANiYGHoFC69pLQw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, "node_modules/@types/node": { "version": "20.19.9", "resolved": "https://registry.npmjs.org/@types/node/-/node-20.19.9.tgz", @@ -94,6 +519,21 @@ "@esbuild/win32-x64": "0.25.8" } }, + "node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, "node_modules/get-tsconfig": { "version": "4.10.1", "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.10.1.tgz", diff --git a/spine-ios/test/src/skeleton_drawable_test.swift b/spine-ios/test/src/skeleton_drawable_test.swift index d7b73ab39..4b9a6bad3 100644 --- a/spine-ios/test/src/skeleton_drawable_test.swift +++ b/spine-ios/test/src/skeleton_drawable_test.swift @@ -4,8 +4,8 @@ import SpineC func runSkeletonDrawableTest() { print("Testing SkeletonDrawable and event listeners...") - // Enable debug extension if needed - spine_enable_debug_extension(false) + // Enable debug extension for leak detection + spine_enable_debug_extension(true) // Load atlas and skeleton data let atlasPath = "../../spine-ts/assets/spineboy.atlas" diff --git a/spine-ios/test/src/skeleton_drawable_test_swift.swift b/spine-ios/test/src/skeleton_drawable_test_swift.swift index 554827385..aa57591d9 100644 --- a/spine-ios/test/src/skeleton_drawable_test_swift.swift +++ b/spine-ios/test/src/skeleton_drawable_test_swift.swift @@ -5,130 +5,132 @@ func runSkeletonDrawableTestSwift() { print("Testing SkeletonDrawable with SpineSwift API...") print("Step 1: Enable debug extension") - // Enable debug extension if needed - enableDebugExtension(false) + // Enable debug extension for leak detection + enableDebugExtension(true) print(" Debug extension configured") - print("Step 2: Load file paths") - // Load atlas and skeleton data - let atlasPath = "../../spine-ts/assets/spineboy.atlas" - let jsonPath = "../../spine-ts/assets/spineboy-pro.json" - - print("Step 3: Read atlas file") - // Read atlas file - guard let atlasData = try? String(contentsOfFile: atlasPath, encoding: .utf8) else { - print("❌ Failed to read atlas file: \(atlasPath)") - return - } - print(" Atlas file read successfully") - - print("Step 4: Load atlas with SpineSwift API") - // Load atlas - let atlas: Atlas do { - atlas = try loadAtlas(atlasData) - print("✓ Atlas loaded successfully") - } catch { - print("❌ Failed to load atlas: \(error)") - return - } + print("Step 2: Load file paths") + // Load atlas and skeleton data + let atlasPath = "../../spine-ts/assets/spineboy.atlas" + let jsonPath = "../../spine-ts/assets/spineboy-pro.json" - // Read skeleton JSON - guard let skeletonJson = try? String(contentsOfFile: jsonPath, encoding: .utf8) else { - print("❌ Failed to read skeleton JSON file: \(jsonPath)") - // atlas will be freed when out of scope - return - } - - // Load skeleton data - let skeletonData: SkeletonData - do { - skeletonData = try loadSkeletonDataJson(atlas: atlas, jsonData: skeletonJson, path: jsonPath) - print("✓ Skeleton data loaded successfully") - } catch { - print("❌ Failed to load skeleton data: \(error)") - // atlas will be freed when out of scope - return - } - - // Create skeleton drawable - let drawable = SkeletonDrawable(skeletonData: skeletonData) - print("✓ SkeletonDrawable created successfully") - - // Test skeleton bounds - print("\nTesting skeleton bounds:") - let initialBounds = drawable.skeleton.bounds - print(" Initial bounds: x=\(initialBounds.x), y=\(initialBounds.y), width=\(initialBounds.width), height=\(initialBounds.height)") - - // Set skeleton to pose and update bounds - drawable.skeleton.setupPose() - drawable.skeleton.updateWorldTransform(Physics.none) - - let boundsAfterPose = drawable.skeleton.bounds - print( - " Bounds after setupPose: x=\(boundsAfterPose.x), y=\(boundsAfterPose.y), width=\(boundsAfterPose.width), height=\(boundsAfterPose.height)") - - // Test position - let position = drawable.skeleton.getPosition() - print(" Skeleton position: x=\(position.x), y=\(position.y)") - - // Set up animation state listener - var eventCount = 0 - drawable.animationState.setListener { type, trackEntry, event in - eventCount += 1 - print(" AnimationState event #\(eventCount): type=\(type), track=\(trackEntry.trackIndex)") - if let event = event { - print(" Event name: \(event.data.name)") + print("Step 3: Read atlas file") + // Read atlas file + guard let atlasData = try? String(contentsOfFile: atlasPath, encoding: .utf8) else { + print("❌ Failed to read atlas file: \(atlasPath)") + return } - } + print(" Atlas file read successfully") - // Set an animation - let trackEntry = drawable.animationState.setAnimation(0, "walk", true) - print("✓ Set animation: walk") - - // Set track entry listener - trackEntry.setListener { type, entry, event in - print(" TrackEntry event: type=\(type)") - if let event = event { - print(" Event data: \(event.data.name)") + print("Step 4: Load atlas with SpineSwift API") + // Load atlas + let atlas: Atlas + do { + atlas = try loadAtlas(atlasData) + print("✓ Atlas loaded successfully") + } catch { + print("❌ Failed to load atlas: \(error)") + return } - } - // Update several times to trigger events - print("\nUpdating animation state...") - for i in 0..<5 { - drawable.update(0.016) // ~60fps - print(" Frame \(i): updated") - } + // Read skeleton JSON + guard let skeletonJson = try? String(contentsOfFile: jsonPath, encoding: .utf8) else { + print("❌ Failed to read skeleton JSON file: \(jsonPath)") + // atlas will be freed when out of scope + return + } - // Test switching animations - print("\nSwitching to run animation...") - _ = drawable.animationState.setAnimation(0, "run", true) + // Load skeleton data + let skeletonData: SkeletonData + do { + skeletonData = try loadSkeletonDataJson(atlas: atlas, jsonData: skeletonJson, path: jsonPath) + print("✓ Skeleton data loaded successfully") + } catch { + print("❌ Failed to load skeleton data: \(error)") + // atlas will be freed when out of scope + return + } - // Update a few more times - for i in 0..<3 { - drawable.update(0.016) - print(" Frame \(i): updated after switching") - } + do { + // Create skeleton drawable + let drawable = SkeletonDrawable(skeletonData: skeletonData) + print("✓ SkeletonDrawable created successfully") - // Test bounds after animation updates - print("\nTesting bounds after animation:") - drawable.skeleton.updateWorldTransform(Physics.none) - let boundsAfterAnimation = drawable.skeleton.bounds - print( - " Bounds after animation: x=\(boundsAfterAnimation.x), y=\(boundsAfterAnimation.y), width=\(boundsAfterAnimation.width), height=\(boundsAfterAnimation.height)" - ) + // Test skeleton bounds + print("\nTesting skeleton bounds:") + let initialBounds = drawable.skeleton.bounds + print(" Initial bounds: x=\(initialBounds.x), y=\(initialBounds.y), width=\(initialBounds.width), height=\(initialBounds.height)") - // Test with different animations that might have different bounds - print("\nTesting bounds with jump animation:") - _ = drawable.animationState.setAnimation(0, "jump", false) - drawable.update(0.5) // Update to middle of jump + // Set skeleton to pose and update bounds + drawable.skeleton.setupPose() + drawable.skeleton.updateWorldTransform(Physics.none) - let boundsAfterJump = drawable.skeleton.bounds - print(" Bounds during jump: x=\(boundsAfterJump.x), y=\(boundsAfterJump.y), width=\(boundsAfterJump.width), height=\(boundsAfterJump.height)") + let boundsAfterPose = drawable.skeleton.bounds + print( + " Bounds after setupPose: x=\(boundsAfterPose.x), y=\(boundsAfterPose.y), width=\(boundsAfterPose.width), height=\(boundsAfterPose.height)") - // Test skin entries - print("\nTesting skin entries:") + // Test position + let position = drawable.skeleton.getPosition() + print(" Skeleton position: x=\(position.x), y=\(position.y)") + + // Set up animation state listener + var eventCount = 0 + drawable.animationState.setListener { type, trackEntry, event in + eventCount += 1 + print(" AnimationState event #\(eventCount): type=\(type), track=\(trackEntry.trackIndex)") + if let event = event { + print(" Event name: \(event.data.name)") + } + } + + // Set an animation + let trackEntry = drawable.animationState.setAnimation(0, "walk", true) + print("✓ Set animation: walk") + + // Set track entry listener + trackEntry.setListener { type, entry, event in + print(" TrackEntry event: type=\(type)") + if let event = event { + print(" Event data: \(event.data.name)") + } + } + + // Update several times to trigger events + print("\nUpdating animation state...") + for i in 0..<5 { + drawable.update(0.016) // ~60fps + print(" Frame \(i): updated") + } + + // Test switching animations + print("\nSwitching to run animation...") + _ = drawable.animationState.setAnimation(0, "run", true) + + // Update a few more times + for i in 0..<3 { + drawable.update(0.016) + print(" Frame \(i): updated after switching") + } + + // Test bounds after animation updates + print("\nTesting bounds after animation:") + drawable.skeleton.updateWorldTransform(Physics.none) + let boundsAfterAnimation = drawable.skeleton.bounds + print( + " Bounds after animation: x=\(boundsAfterAnimation.x), y=\(boundsAfterAnimation.y), width=\(boundsAfterAnimation.width), height=\(boundsAfterAnimation.height)" + ) + + // Test with different animations that might have different bounds + print("\nTesting bounds with jump animation:") + _ = drawable.animationState.setAnimation(0, "jump", false) + drawable.update(0.5) // Update to middle of jump + + let boundsAfterJump = drawable.skeleton.bounds + print(" Bounds during jump: x=\(boundsAfterJump.x), y=\(boundsAfterJump.y), width=\(boundsAfterJump.width), height=\(boundsAfterJump.height)") + + // Test skin entries + print("\nTesting skin entries:") // First, check available skins let skins = skeletonData.skins @@ -303,16 +305,18 @@ func runSkeletonDrawableTestSwift() { print(" Could not find bone 'rear-shin'") } - // Clear listener before cleanup - // drawable.animationState.setListener(nil) + // Clear listener before cleanup + // drawable.animationState.setListener(nil) + } - // Cleanup happens automatically via deinit - // skeletonData and atlas will be freed when out of scope + skeletonData.dispose() + atlas.dispose() - // Report memory leaks if debug extension is enabled + print("\n✓ SpineSwift API test complete") + } + + // Report memory leaks after Swift objects have gone out of scope reportLeaks() - - print("\n✓ SpineSwift API test complete") } // Test function is called from main.swift