From 85b19383b96175c5e5e8bd963cc1e6781b8dc034 Mon Sep 17 00:00:00 2001 From: Sebastian Schmidt Date: Thu, 14 Sep 2023 12:21:41 -0700 Subject: [PATCH] Fixes iOS hand landmarker connections PiperOrigin-RevId: 565442497 --- .../ios/vision/hand_landmarker/sources/MPPHandLandmarker.h | 5 +++++ .../ios/vision/hand_landmarker/sources/MPPHandLandmarker.mm | 4 ++++ .../hand_landmarker/sources/MPPHandLandmarksConnections.h | 4 ++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/mediapipe/tasks/ios/vision/hand_landmarker/sources/MPPHandLandmarker.h b/mediapipe/tasks/ios/vision/hand_landmarker/sources/MPPHandLandmarker.h index bed452cb..80973d39 100644 --- a/mediapipe/tasks/ios/vision/hand_landmarker/sources/MPPHandLandmarker.h +++ b/mediapipe/tasks/ios/vision/hand_landmarker/sources/MPPHandLandmarker.h @@ -33,6 +33,8 @@ typedef NS_ENUM(NSUInteger, MPPHandLandmark) { MPPHandLandmarkThumbIP, + MPPHandLandmarkThumbTIP, + MPPHandLandmarkIndexFingerMCP, MPPHandLandmarkIndexFingerPIP, @@ -78,6 +80,9 @@ NS_SWIFT_NAME(HandLandmarker) /** The array of connections between the landmarks in the palm. */ @property(class, nonatomic, readonly) NSArray *handPalmConnections; +/** The array of connections between the landmarks in the thumb. */ +@property(class, nonatomic, readonly) NSArray *handThumbConnections; + /** The array of connections between the landmarks in the index finger. */ @property(class, nonatomic, readonly) NSArray *handIndexFingerConnections; diff --git a/mediapipe/tasks/ios/vision/hand_landmarker/sources/MPPHandLandmarker.mm b/mediapipe/tasks/ios/vision/hand_landmarker/sources/MPPHandLandmarker.mm index b05e6755..cedbf0f2 100644 --- a/mediapipe/tasks/ios/vision/hand_landmarker/sources/MPPHandLandmarker.mm +++ b/mediapipe/tasks/ios/vision/hand_landmarker/sources/MPPHandLandmarker.mm @@ -169,6 +169,10 @@ static NSString *const kTaskName = @"handLandmarker"; return MPPHandPalmConnections; } ++ (NSArray *)handThumbConnections { + return MPPHandThumbConnections; +} + + (NSArray *)handIndexFingerConnections { return MPPHandIndexFingerConnections; } diff --git a/mediapipe/tasks/ios/vision/hand_landmarker/sources/MPPHandLandmarksConnections.h b/mediapipe/tasks/ios/vision/hand_landmarker/sources/MPPHandLandmarksConnections.h index 33d16bee..57b492b2 100644 --- a/mediapipe/tasks/ios/vision/hand_landmarker/sources/MPPHandLandmarksConnections.h +++ b/mediapipe/tasks/ios/vision/hand_landmarker/sources/MPPHandLandmarksConnections.h @@ -44,8 +44,8 @@ NSArray *const MPPHandRingFingerConnections = @[ ]; NSArray *const MPPHandPinkyConnections = @[ - [[MPPConnection alloc] initWithStart:16 end:17], [[MPPConnection alloc] initWithStart:17 end:18], - [[MPPConnection alloc] initWithStart:18 end:19] + [[MPPConnection alloc] initWithStart:17 end:18], [[MPPConnection alloc] initWithStart:18 end:19], + [[MPPConnection alloc] initWithStart:19 end:20] ]; NSArray *const MPPHandConnections = [[[[[[NSArray