Merge pull request #2 from quickpose/0.8rc

0.8rc

Author: pablonosh

CHANGELOG.md

@@ -4,6 +4,19 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## v0.8 - 2023-04-26
+
+### Added
+- Depth Measurement Bar for Fitness Measurements
+- Supporting Sumo Squats, Plank, Left and Right Leg Lunges and Cobra wings.
+- Fitness Measurements return customizable guidance prompts
+
+## v0.7 - 2023-03-20
+
+### Fixed
+- Archive Bug
+
+
 ## v0.6 - 2023-03-15
 
 ### Added

Package.swift

@@ -16,13 +16,17 @@ let package = Package(
   ],
   dependencies: [],
   targets: [
+    
+    .binaryTarget(name: "QuickPoseCore", path: "QuickPoseCore.xcframework"),
     .target(name: "QuickPoseCoreTarget", dependencies: ["QuickPoseCore"], path: "QuickPoseCoreWrapper"),
-    .target(name: "QuickPoseCamera", dependencies: ["QuickPoseCoreTarget"]),
+    .binaryTarget(name: "QuickPoseMP", path: "QuickPoseMP.xcframework"),
+    .target(name: "QuickPoseMPTarget", dependencies: ["QuickPoseMP",], path: "QuickPoseMPWrapper", linkerSettings: [.linkedLibrary("c++")]),
+    .target(name: "QuickPoseCamera", dependencies: ["QuickPoseCore"]),
     .target(name: "QuickPoseSwiftUI", dependencies: ["QuickPoseCamera"]),
 
-    .target(name: "QuickPoseMPTarget", dependencies: ["QuickPoseMP",], path: "QuickPoseMPWrapper", linkerSettings: [.linkedLibrary("c++")]),
+
+    
+    
 
-    .binaryTarget(name: "QuickPoseCore", path: "QuickPoseCore.xcframework"),
-    .binaryTarget(name: "QuickPoseMP", path: "QuickPoseMP.xcframework"),
   ]
 )

QuickPoseCore.xcframework/Info.plist

@@ -6,29 +6,29 @@
 	<array>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>QuickPoseCore.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
-				<string>x86_64</string>
+				<string>arm64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>QuickPoseCore.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
-				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

QuickPoseCore.xcframework/ios-arm64/QuickPoseCore.framework/Headers/QuickPose.h

@@ -3,7 +3,7 @@
 //  QuickPoseiOS.h
 //  QuickPoseiOS
 //
-//  Created by Peter Nash on 11/01/2023.
+//  Created by QuickPose.ai on 11/01/2023.
 //
 
 #import <Foundation/Foundation.h>

QuickPoseCore.xcframework/ios-arm64/QuickPoseCore.framework/Headers/QuickPoseCore-Swift.h

@@ -309,7 +309,7 @@ using UInt = size_t;
 ///         QuickPoseOverlayView(overlayImage: $overlayImage)
 ///     }
 ///     .onAppear {
-///         quickPose.start(features: [.overlay(.userLeftArm)], onFrame: { status, image, features, landmarks in
+///         quickPose.start(features: [.overlay(.userLeftArm)], onFrame: { status, image, features, guidance, landmarks in
 ///             overlayImage = image
 ///         })
 ///     }
@@ -325,13 +325,13 @@ using UInt = size_t;
 /// Applying AI to camera feed is memory intensive and requires releasing for production use.
 /// The <code>start(features:onStart:onFrame:)</code> accepts a <code>Feature</code> array, and two closures one to asynchronously return when the camera has started, and second for each processed frame. Here only the onFrame image is read and applied the the view’s state, which triggers a SwiftUI refresh of the <code>QuickPoseOverlayView</code>.
 /// \code
-/// quickPose.start(features: [.overlay(.userLeftArm)], onFrame: { _, image, _, _ in
+/// quickPose.start(features: [.overlay(.userLeftArm)], onFrame: { _, image, _, _, _ in
 ///     overlayImage = image
 ///   })
 ///
 /// \endcodeFor a more advanced example we can reference the <code>Status</code> state to log if the user is found and current performance via the returned frames-per-second.
 /// \code
-/// quickPose.start(features: [.overlay(.userLeftArm)], onFrame: { status, image, _, _ in
+/// quickPose.start(features: [.overlay(.userLeftArm)], onFrame: { status, image, _, _, _ in
 ///     if case let .success(fps) = status {
 ///         print("fps: \(fps)")
 ///         overlayImage = image
@@ -348,7 +348,7 @@ using UInt = size_t;
 /// .onAppear {
 ///     quickPose.start(features: [selectedFeature], onStart: {
 ///         withAnimation { cameraViewOpacity = 1.0 } // unhide the camera when loaded
-///     }, onFrame: { status, image, features, _ in
+///     }, onFrame: { status, image, features, _, _ in
 ///         if case let .success(fps) = status {
 ///             if case let .reading(_, displayString) = features[selectedFeature] {
 ///                 lastResult = displayString
@@ -368,14 +368,14 @@ using UInt = size_t;
 /// \endcodeFor an example with changed formatting such as font size, color and line width we can specify a <code>Style</code> class
 /// \code
 /// let smallerStyle = QuickPose.Style(relativeLineWidth: 0.33)
-/// quickPose.start(features: [.overlay(.userLeftArm, style: smallerStyle)], onFrame: { status, image, _, _ in
+/// quickPose.start(features: [.overlay(.userLeftArm, style: smallerStyle)], onFrame: { status, image, _, _, _ in
 ///     ....
 /// })
 ///
 /// \endcodeAnd for conditional formatting when the angle goes above 120 degrees use:
 /// \code
 /// let conditionalStyle = QuickPose.Style(conditionalColors: [QuickPose.Style.ConditionalColor(min: 120, max: nil, color: UIColor.red)])
-/// quickPose.start(features: [.overlay(.userLeftArm, style: conditionalStyle)], onFrame: { status, image, _, _ in
+/// quickPose.start(features: [.overlay(.userLeftArm, style: conditionalStyle)], onFrame: { status, image, _, _, _ in
 ///     ....
 /// })
 ///