-
Notifications
You must be signed in to change notification settings - Fork 518
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[arkit] Add ARBlendShapeLocationOptions strong dictionary #2696
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -534,29 +534,300 @@ interface ARTrackable { | |
[BaseType (typeof(ARConfiguration))] | ||
interface ARFaceTrackingConfiguration {} | ||
|
||
[iOS (11,0)] | ||
[NoWatch, NoTV, NoMac] | ||
[StrongDictionary ("ARBlendShapeLocationKeys")] | ||
interface ARBlendShapeLocationOptions { | ||
|
||
float BrowDownLeft { get; set; } | ||
|
||
float BrowDownRight { get; set; } | ||
|
||
float BrowInnerUp { get; set; } | ||
|
||
float BrowOuterUpLeft { get; set; } | ||
|
||
float BrowOuterUpRight { get; set; } | ||
|
||
float CheekPuff { get; set; } | ||
|
||
float CheekSquintLeft { get; set; } | ||
|
||
float CheekSquintRight { get; set; } | ||
|
||
float EyeBlinkLeft { get; set; } | ||
|
||
float EyeBlinkRight { get; set; } | ||
|
||
float EyeLookDownLeft { get; set; } | ||
|
||
float EyeLookDownRight { get; set; } | ||
|
||
float EyeLookInLeft { get; set; } | ||
|
||
float EyeLookInRight { get; set; } | ||
|
||
float EyeLookOutLeft { get; set; } | ||
|
||
float EyeLookOutRight { get; set; } | ||
|
||
float EyeLookUpLeft { get; set; } | ||
|
||
float EyeLookUpRight { get; set; } | ||
|
||
float EyeSquintLeft { get; set; } | ||
|
||
float EyeSquintRight { get; set; } | ||
|
||
float EyeWideLeft { get; set; } | ||
|
||
float EyeWideRight { get; set; } | ||
|
||
float JawForward { get; set; } | ||
|
||
float JawLeft { get; set; } | ||
|
||
float JawOpen { get; set; } | ||
|
||
float JawRight { get; set; } | ||
|
||
float MouthClose { get; set; } | ||
|
||
float MouthDimpleLeft { get; set; } | ||
|
||
float MouthDimpleRight { get; set; } | ||
|
||
float MouthFrownLeft { get; set; } | ||
|
||
float MouthFrownRight { get; set; } | ||
|
||
float MouthFunnel { get; set; } | ||
|
||
float MouthLeft { get; set; } | ||
|
||
float MouthLowerDownLeft { get; set; } | ||
|
||
float MouthLowerDownRight { get; set; } | ||
|
||
float MouthPressLeft { get; set; } | ||
|
||
float MouthPressRight { get; set; } | ||
|
||
float MouthPucker { get; set; } | ||
|
||
float MouthRight { get; set; } | ||
|
||
float MouthRollLower { get; set; } | ||
|
||
float MouthRollUpper { get; set; } | ||
|
||
float MouthShrugLower { get; set; } | ||
|
||
float MouthShrugUpper { get; set; } | ||
|
||
float MouthSmileLeft { get; set; } | ||
|
||
float MouthSmileRight { get; set; } | ||
|
||
float MouthStretchLeft { get; set; } | ||
|
||
float MouthStretchRight { get; set; } | ||
|
||
float MouthUpperUpLeft { get; set; } | ||
|
||
float MouthUpperUpRight { get; set; } | ||
|
||
float NoseSneerLeft { get; set; } | ||
|
||
float NoseSneerRight { get; set; } | ||
} | ||
|
||
[iOS (11,0)] | ||
[NoWatch, NoTV, NoMac] | ||
[Static] | ||
[Internal] | ||
interface ARBlendShapeLocationKeys { | ||
|
||
[Field ("ARBlendShapeLocationBrowDownLeft")] | ||
NSString BrowDownLeftKey { get; } | ||
|
||
[Field ("ARBlendShapeLocationBrowDownRight")] | ||
NSString BrowDownRightKey { get; } | ||
|
||
[Field ("ARBlendShapeLocationBrowInnerUp")] | ||
NSString BrowInnerUpKey { get; } | ||
|
||
[Field ("ARBlendShapeLocationBrowOuterUpLeft")] | ||
NSString BrowOuterUpLeftKey { get; } | ||
|
||
[Field ("ARBlendShapeLocationBrowOuterUpRight")] | ||
NSString BrowOuterUpRightKey { get; } | ||
|
||
[Field ("ARBlendShapeLocationCheekPuff")] | ||
NSString CheekPuffKey { get; } | ||
|
||
[Field ("ARBlendShapeLocationCheekSquintLeft")] | ||
NSString CheekSquintLeftKey { get; } | ||
|
||
[Field ("ARBlendShapeLocationCheekSquintRight")] | ||
NSString CheekSquintRightKey { get; } | ||
|
||
[Field ("ARBlendShapeLocationEyeBlinkLeft")] | ||
NSString EyeBlinkLeftKey { get; } | ||
|
||
[Field ("ARBlendShapeLocationEyeBlinkRight")] | ||
NSString EyeBlinkRightKey { get; } | ||
|
||
[Field ("ARBlendShapeLocationEyeLookDownLeft")] | ||
NSString EyeLookDownLeftKey { get; } | ||
|
||
[Field ("ARBlendShapeLocationEyeLookDownRight")] | ||
NSString EyeLookDownRightKey { get; } | ||
|
||
[Field ("ARBlendShapeLocationEyeLookInLeft")] | ||
NSString EyeLookInLeftKey { get; } | ||
|
||
[Field ("ARBlendShapeLocationEyeLookInRight")] | ||
NSString EyeLookInRightKey { get; } | ||
|
||
[Field ("ARBlendShapeLocationEyeLookOutLeft")] | ||
NSString EyeLookOutLeftKey { get; } | ||
|
||
[Field ("ARBlendShapeLocationEyeLookOutRight")] | ||
NSString EyeLookOutRightKey { get; } | ||
|
||
[Field ("ARBlendShapeLocationEyeLookUpLeft")] | ||
NSString EyeLookUpLeftKey { get; } | ||
|
||
[Field ("ARBlendShapeLocationEyeLookUpRight")] | ||
NSString EyeLookUpRightKey { get; } | ||
|
||
[Field ("ARBlendShapeLocationEyeSquintLeft")] | ||
NSString EyeSquintLeftKey { get; } | ||
|
||
[Field ("ARBlendShapeLocationEyeSquintRight")] | ||
NSString EyeSquintRightKey { get; } | ||
|
||
[Field ("ARBlendShapeLocationEyeWideLeft")] | ||
NSString EyeWideLeftKey { get; } | ||
|
||
[Field ("ARBlendShapeLocationEyeWideRight")] | ||
NSString EyeWideRightKey { get; } | ||
|
||
[Field ("ARBlendShapeLocationJawForward")] | ||
NSString JawForwardKey { get; } | ||
|
||
[Field ("ARBlendShapeLocationJawLeft")] | ||
NSString JawLeftKey { get; } | ||
|
||
[Field ("ARBlendShapeLocationJawOpen")] | ||
NSString JawOpenKey { get; } | ||
|
||
[Field ("ARBlendShapeLocationJawRight")] | ||
NSString JawRightKey { get; } | ||
|
||
[Field ("ARBlendShapeLocationMouthClose")] | ||
NSString MouthCloseKey { get; } | ||
|
||
[Field ("ARBlendShapeLocationMouthDimpleLeft")] | ||
NSString MouthDimpleLeftKey { get; } | ||
|
||
[Field ("ARBlendShapeLocationMouthDimpleRight")] | ||
NSString MouthDimpleRightKey { get; } | ||
|
||
[Field ("ARBlendShapeLocationMouthFrownLeft")] | ||
NSString MouthFrownLeftKey { get; } | ||
|
||
[Field ("ARBlendShapeLocationMouthFrownRight")] | ||
NSString MouthFrownRightKey { get; } | ||
|
||
[Field ("ARBlendShapeLocationMouthFunnel")] | ||
NSString MouthFunnelKey { get; } | ||
|
||
[Field ("ARBlendShapeLocationMouthLeft")] | ||
NSString MouthLeftKey { get; } | ||
|
||
[Field ("ARBlendShapeLocationMouthLowerDownLeft")] | ||
NSString MouthLowerDownLeftKey { get; } | ||
|
||
[Field ("ARBlendShapeLocationMouthLowerDownRight")] | ||
NSString MouthLowerDownRightKey { get; } | ||
|
||
[Field ("ARBlendShapeLocationMouthPressLeft")] | ||
NSString MouthPressLeftKey { get; } | ||
|
||
[Field ("ARBlendShapeLocationMouthPressRight")] | ||
NSString MouthPressRightKey { get; } | ||
|
||
[Field ("ARBlendShapeLocationMouthPucker")] | ||
NSString MouthPuckerKey { get; } | ||
|
||
[Field ("ARBlendShapeLocationMouthRight")] | ||
NSString MouthRightKey { get; } | ||
|
||
[Field ("ARBlendShapeLocationMouthRollLower")] | ||
NSString MouthRollLowerKey { get; } | ||
|
||
[Field ("ARBlendShapeLocationMouthRollUpper")] | ||
NSString MouthRollUpperKey { get; } | ||
|
||
[Field ("ARBlendShapeLocationMouthShrugLower")] | ||
NSString MouthShrugLowerKey { get; } | ||
|
||
[Field ("ARBlendShapeLocationMouthShrugUpper")] | ||
NSString MouthShrugUpperKey { get; } | ||
|
||
[Field ("ARBlendShapeLocationMouthSmileLeft")] | ||
NSString MouthSmileLeftKey { get; } | ||
|
||
[Field ("ARBlendShapeLocationMouthSmileRight")] | ||
NSString MouthSmileRightKey { get; } | ||
|
||
[Field ("ARBlendShapeLocationMouthStretchLeft")] | ||
NSString MouthStretchLeftKey { get; } | ||
|
||
[Field ("ARBlendShapeLocationMouthStretchRight")] | ||
NSString MouthStretchRightKey { get; } | ||
|
||
[Field ("ARBlendShapeLocationMouthUpperUpLeft")] | ||
NSString MouthUpperUpLeftKey { get; } | ||
|
||
[Field ("ARBlendShapeLocationMouthUpperUpRight")] | ||
NSString MouthUpperUpRightKey { get; } | ||
|
||
[Field ("ARBlendShapeLocationNoseSneerLeft")] | ||
NSString NoseSneerLeftKey { get; } | ||
|
||
[Field ("ARBlendShapeLocationNoseSneerRight")] | ||
NSString NoseSneerRightKey { get; } | ||
} | ||
|
||
[iOS (11,0)] | ||
[NoWatch, NoTV, NoMac] | ||
[BaseType (typeof(ARAnchor))] | ||
interface ARFaceAnchor : ARTrackable { | ||
[Export ("geometry")] | ||
ARFaceGeometry Geometry { get; } | ||
|
||
/* Will come in next PR | ||
// @property (readonly, nonatomic) NSDictionary<ARBlendShapeLocation,NSNumber *> * _Nonnull blendShapes; | ||
[EditorBrowsable (EditorBrowsableState.Advanced)] | ||
[Export ("blendShapes")] | ||
NSDictionary<NSString, NSNumber> BlendShapes { get; } | ||
*/ | ||
NSDictionary WeakBlendShapes { get; } | ||
|
||
[Wrap ("WeakBlendShapes")] | ||
ARBlendShapeLocationOptions BlendShapes { get; } | ||
} | ||
|
||
[iOS (11,0)] | ||
[NoWatch, NoTV, NoMac] | ||
[BaseType (typeof(NSObject))] | ||
[DisableDefaultCtor] | ||
interface ARFaceGeometry : NSCopying { | ||
/* Will come in next PR | ||
[EditorBrowsable (EditorBrowsableState.Advanced)] | ||
[Export ("initWithBlendShapes:")] | ||
IntPtr Constructor (NSDictionary<NSString, NSNumber> blendShapes); | ||
*/ | ||
IntPtr Constructor (NSDictionary blendShapes); | ||
|
||
[Wrap ("this ((NSDictionary)blendShapes?.Dictionary)")] | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why is this cast needed? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It's trying to use |
||
IntPtr Constructor (ARBlendShapeLocationOptions blendShapes); | ||
|
||
[Export ("vertexCount")] | ||
nuint VertexCount { get; } | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Use
[Internal]
so this leaves us the option to expose it as a smart enum later (at the cost of extra manual code or generator changes).There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes good idea, thanks.