added PoseJointByName to PoseDetector

vvvv · Jan 24, 2024 · 2c84f3e · 2c84f3e
1 parent 3f33743
commit 2c84f3e
Show file tree

Hide file tree

Showing 6 changed files with 571 additions and 22 deletions.
diff --git a/VL.MediaPipe.vl b/VL.MediaPipe.vl
@@ -2962,11 +2962,9 @@
                           <FullNameCategoryReference ID="VL.MediaPipe.PoseResults.Landmark" />
                         </p:NodeReference>
                         <Pin Id="AGQEHmYcH78PAiBbs5oi0x" Name="Input" Kind="StateInputPin" />
-                        <Pin Id="P6Dts1rIPPZOhmKVrVexqT" Name="Output" Kind="OutputPin" IsHidden="true" />
+                        <Pin Id="P6Dts1rIPPZOhmKVrVexqT" Name="Output" Kind="OutputPin" />
                         <Pin Id="OhiPYaCKuGQN5Gh5AyU5L7" Name="Position" Kind="OutputPin" />
                       </Node>
-                      <Pin Id="GjXmix48xfFPADWr2WkqEq" Name="Input" Kind="InputPin" />
-                      <Pin Id="Uof55r8diSoOVRJdPo3BEs" Name="Position" Kind="OutputPin" />
                       <ControlPoint Id="UmeeM8ATvTEL5k5MHP0tJj" Bounds="468,491" />
                       <Node Bounds="466,437,85,19" Id="BMEvx6BMMQNQdyqaT1OFNq">
                         <p:NodeReference LastCategoryFullName="Math.Ranges" LastDependency="VL.CoreLib.vl">
@@ -2983,6 +2981,9 @@
                       <Link Id="AjTTqi0mAOSO7DXdzb4T1R" Ids="UmeeM8ATvTEL5k5MHP0tJj,Uof55r8diSoOVRJdPo3BEs" IsHidden="true" />
                       <Link Id="MGlnTyP0o7MN8fZ97FD3ml" Ids="HgpoItlGlJGOX1lJhAp1Jb,UmeeM8ATvTEL5k5MHP0tJj" />
                       <Link Id="BK69HPR7dh2NvwAiijBar8" Ids="OhiPYaCKuGQN5Gh5AyU5L7,PNA4ZP64VC2PP5qa9PsaCu" />
+                      <Pin Id="GjXmix48xfFPADWr2WkqEq" Name="Input" Kind="InputPin" />
+                      <Pin Id="BZVQFjJPBqnMEgx1p2xkbd" Name="Output" Kind="OutputPin" />
+                      <Pin Id="Uof55r8diSoOVRJdPo3BEs" Name="Position" Kind="OutputPin" />
                     </Patch>
                   </Node>
                 </Canvas>
@@ -3009,10 +3010,69 @@
                 <ProcessDefinition Id="Qhok4czPviTMwkdH3Bb6Ap" IsHidden="true" />
               </Patch>
             </Node>
+            <!--
+
+    ************************ PoseJointByName ************************
+
+-->
+            <Node Name="PoseJointByName" Bounds="908,427,152,157" Id="EaU45ZMlUiALtjOt95DQ4P">
+              <p:NodeReference LastCategoryFullName="Primitive" LastDependency="Builtin">
+                <Choice Kind="OperationDefinition" Name="Operation" />
+              </p:NodeReference>
+              <Patch Id="TSMkMiTfjoNPdA5P31k75a">
+                <Node Bounds="983,470,65,19" Id="OmYiEzHKqP7QQTiO1U3kmf">
+                  <p:NodeReference LastCategoryFullName="Primitive.Enum" LastDependency="VL.CoreLib.vl">
+                    <Choice Kind="NodeFlag" Name="Node" Fixed="true" />
+                    <Choice Kind="OperationCallFlag" Name="Enum2Ord" />
+                  </p:NodeReference>
+                  <Pin Id="OOKIuDV6tYcPdLK1NPPLIi" Name="Input" Kind="StateInputPin" />
+                  <Pin Id="OlU9a4YjdSQL8P9W3yrakZ" Name="Result" Kind="OutputPin" />
+                </Node>
+                <ControlPoint Id="GpN54YFr1c2QWeb9FzPXya" Bounds="985,445" />
+                <Link Id="OlwLYdRvzxqObnv69AV3Vd" Ids="GpN54YFr1c2QWeb9FzPXya,OOKIuDV6tYcPdLK1NPPLIi" />
+                <Link Id="SdYO1QGn2ZAOlHdXOpTKgc" Ids="VAMszPnDWPYNEkE1EiErfw,GpN54YFr1c2QWeb9FzPXya" IsHidden="true" />
+                <Node Bounds="921,504,52,19" Id="NHbYyQ2iwsSPXPxl2Erf7P">
+                  <p:NodeReference LastCategoryFullName="Collections.Interfaces.IReadOnlyList" LastDependency="VL.CoreLib.vl">
+                    <Choice Kind="NodeFlag" Name="Node" Fixed="true" />
+                    <CategoryReference Kind="MutableInterfaceType" Name="IReadOnlyList" NeedsToBeDirectParent="true" />
+                    <Choice Kind="OperationCallFlag" Name="GetSlice" />
+                  </p:NodeReference>
+                  <Pin Id="PunTnR6nB0gLsJED3NozKT" Name="Input" Kind="StateInputPin" />
+                  <Pin Id="RUdSV9QA1T0MetkTU7BYDw" Name="Default Value" Kind="InputPin" />
+                  <Pin Id="TnqRCfCTg2ONydVs0cHo1I" Name="Index" Kind="InputPin" />
+                  <Pin Id="GA4yFzihNyBLtxwpPea15P" Name="Result" Kind="OutputPin" />
+                </Node>
+                <Link Id="OL3ma7hP8CdOMapT3xueM2" Ids="OlU9a4YjdSQL8P9W3yrakZ,TnqRCfCTg2ONydVs0cHo1I" />
+                <ControlPoint Id="Hl4AvTYsfNrNoU6SQn6aIB" Bounds="922,447" />
+                <Link Id="VSRAnDFmDPZOO3zwxiAqlX" Ids="Hl4AvTYsfNrNoU6SQn6aIB,PunTnR6nB0gLsJED3NozKT" />
+                <Link Id="Q9DsxqokcOWOukq1GGsOV2" Ids="EZgfeauSIdOLelA4d45NtR,Hl4AvTYsfNrNoU6SQn6aIB" IsHidden="true" />
+                <ControlPoint Id="FytlhkV860ZOlX5GZj9L9F" Bounds="922,567" />
+                <Link Id="KTT9amSny7HLP3WV77gGhp" Ids="GA4yFzihNyBLtxwpPea15P,FytlhkV860ZOlX5GZj9L9F" />
+                <Link Id="FxRJrjrDTnPLqyNpwTVlAW" Ids="FytlhkV860ZOlX5GZj9L9F,TtZrM1e7hLtOvmMigNTaYO" IsHidden="true" />
+                <Pin Id="EZgfeauSIdOLelA4d45NtR" Name="Input" Kind="InputPin" Bounds="96,565">
+                  <p:TypeAnnotation LastCategoryFullName="Collections.Mutable" LastDependency="VL.CoreLib.vl">
+                    <Choice Kind="TypeFlag" Name="MutableArray" />
+                    <p:TypeArguments>
+                      <TypeReference>
+                        <Choice Kind="TypeFlag" Name="Landmark" />
+                        <FullNameCategoryReference ID="MediaPipe.PoseDetector" />
+                      </TypeReference>
+                    </p:TypeArguments>
+                  </p:TypeAnnotation>
+                </Pin>
+                <Pin Id="VAMszPnDWPYNEkE1EiErfw" Name="Joint" Kind="InputPin" Bounds="117,538">
+                  <p:TypeAnnotation LastCategoryFullName="VL.MediaPipe.PoseResults" LastDependency="VL.MediaPipe.dll">
+                    <Choice Kind="TypeFlag" Name="PoseJoints" />
+                  </p:TypeAnnotation>
+                </Pin>
+                <Pin Id="TtZrM1e7hLtOvmMigNTaYO" Name="Result" Kind="OutputPin" Bounds="89,660" />
+              </Patch>
+            </Node>
           </Canvas>
           <ProcessDefinition Id="BO32KjPsP3PPDLOMmuwnz4">
             <Fragment Id="U4JJBOfVxJVMzjsX0YE98T" Patch="Qrl3dTsFDRtLXA34ETNrOL" Enabled="true" />
             <Fragment Id="HMS2NKfeh47OsgWJCoXofy" Patch="PgnxYEAXLHhQK4JJZokFwZ" Enabled="true" />
+            <Fragment Id="VZMCA6SyGQDP2hKD79OMFQ" Patch="EaU45ZMlUiALtjOt95DQ4P" />
           </ProcessDefinition>
           <Link Id="HGlU0KzQKTRO5FdSPvNBjX" Ids="VifAGnwp458NJOW3v5U4nP,LfBDrWzTXDeL5amb2KMNZu" IsHidden="true" />
           <Link Id="G2AlDT4ef7KNCVZhNX1fRo" Ids="LfBDrWzTXDeL5amb2KMNZu,KOs049rYyNJLNrNNrEmQe9" />
@@ -3414,8 +3474,8 @@
                       <Link Id="DP3m56oiimfQXoKGArEu3D" Ids="FMHKH281BAsOd1fjWwisxA,NBUoZMvhKjDO7pd3NX230C" />
                       <Link Id="Va9WdqNHJbBOaYOECAKW0W" Ids="CNb0IkB4t4vMS6ML9apRV8,VOkwvPv5G2NLx7TOTmXkcN" />
                       <Pin Id="IuAUUXIq1pzOgFr3AHHdGE" Name="Input" Kind="InputPin" />
-                      <Pin Id="Mrc2dkUy7DtQThuGaepr1d" Name="Position" Kind="OutputPin" Bounds="479,436" />
                       <Pin Id="L7TAoudTNz7NWiQLHdJZJv" Name="Output" Kind="OutputPin" />
+                      <Pin Id="Mrc2dkUy7DtQThuGaepr1d" Name="Position" Kind="OutputPin" Bounds="479,436" />
                     </Patch>
                   </Node>
                 </Canvas>
@@ -3462,10 +3522,10 @@
             </Node>
             <!--
 
-    ************************ LandmarkByName ************************
+    ************************ FingerJointByName ************************
 
 -->
-            <Node Name="LandmarkByName" Bounds="761,483,152,157" Id="ENkoKpDvaHWN2T8lHTboxW">
+            <Node Name="FingerJointByName" Bounds="761,483,152,157" Id="ENkoKpDvaHWN2T8lHTboxW">
               <p:NodeReference LastCategoryFullName="Primitive" LastDependency="Builtin">
                 <Choice Kind="OperationDefinition" Name="Operation" />
               </p:NodeReference>
@@ -3510,9 +3570,9 @@
                     </p:TypeArguments>
                   </p:TypeAnnotation>
                 </Pin>
-                <Pin Id="HEZVn9h9zPUPogA1dOxnIB" Name="Landmark" Kind="InputPin" Bounds="117,538">
+                <Pin Id="HEZVn9h9zPUPogA1dOxnIB" Name="Joint" Kind="InputPin" Bounds="117,538">
                   <p:TypeAnnotation LastCategoryFullName="MediaPipe.HandResults" LastDependency="VL.MediaPipe.dll">
-                    <Choice Kind="TypeFlag" Name="Fingers" />
+                    <Choice Kind="TypeFlag" Name="FingerJoints" />
                   </p:TypeAnnotation>
                 </Pin>
                 <Pin Id="C2el1m6cAfJNdvMIkjVFX1" Name="Result" Kind="OutputPin" Bounds="89,660" />

diff --git a/deployment/VL.MediaPipe.nuspec b/deployment/VL.MediaPipe.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>VL.MediaPipe</id>
-    <version>0.1.1-alpha</version>
+    <version>0.1.2-alpha</version>
     <title>VL.MediaPipe</title>
     <authors>Dom Scott, Torin Blankensmith, vvvv</authors>
     <owners>vvvv</owners>

diff --git a/help/HowTo Use the HandDetector.vl b/help/HowTo Use the HandDetector.vl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Document xmlns:p="property" xmlns:r="reflection" Id="Jr3PSf8cf9JO0yxDYF4J1a" LanguageVersion="2024.6.0-0022-g93bfcdd657" Version="0.128">
+<Document xmlns:p="property" xmlns:r="reflection" Id="JgxE2kJFTvtMLbT7kQd5sl" LanguageVersion="2024.6.0-0022-g93bfcdd657" Version="0.128">
   <NugetDependency Id="LlgpqYpbpIDN4Yh4YGtVJj" Location="VL.CoreLib" Version="2024.6.0-0022-g93bfcdd657" />
   <Patch Id="Q76TiVeE82cNHpdVGLNjIM">
     <Canvas Id="PHmrnxQ15guOqUWjJc4afe" DefaultCategory="Main" CanvasType="FullCategory" />
@@ -20,7 +20,6 @@
               <Choice Kind="NodeFlag" Name="Node" Fixed="true" />
               <Choice Kind="ProcessAppFlag" Name="MediaPipe" />
             </p:NodeReference>
-            <p:HelpFocus p:Assembly="VL.Lang" p:Type="VL.Model.HelpPriority">High</p:HelpFocus>
             <Pin Id="My9l2Mm0xueNc3nd0TOB8a" Name="Node Context" Kind="InputPin" IsHidden="true" />
             <Pin Id="OsFIXnABJ7ENfHhWyzbx87" Name="Detect faces" Kind="InputPin" />
             <Pin Id="PhEY81WoppxOCl8tR4rr2W" Name="Detect facial landmarks" Kind="InputPin" />
@@ -117,7 +116,7 @@
               <Choice Kind="NodeFlag" Name="Node" Fixed="true" />
               <Choice Kind="ProcessAppFlag" Name="HandDetector" />
             </p:NodeReference>
-            <p:HelpFocus p:Assembly="VL.Lang" p:Type="VL.Model.HelpPriority">Low</p:HelpFocus>
+            <p:HelpFocus p:Assembly="VL.Lang" p:Type="VL.Model.HelpPriority">High</p:HelpFocus>
             <Pin Id="RROZja0sJBHOxcKPQhf2WF" Name="Node Context" Kind="InputPin" IsHidden="true" />
             <Pin Id="CyM5ZduSSS0NQMqN1D4lBP" Name="Input" Kind="InputPin" />
             <Pin Id="BxMzwSOvTy8Pqt13aF7PUn" Name="Max Number of Hands" Kind="InputPin" />
@@ -257,14 +256,14 @@
                 <Pin Id="T0ms4Wz88HSMlHJhVUWlbn" Name="Output" Kind="StateOutputPin" />
               </Node>
               <ControlPoint Id="SQuBeBQP4MeOG8Dp3iAiHZ" Bounds="749,504" />
-              <Node Bounds="437,668,98,19" Id="Gbe1oMsAuLsQATggcRyhFz">
+              <Node Bounds="437,668,102,19" Id="Gbe1oMsAuLsQATggcRyhFz">
                 <p:NodeReference LastCategoryFullName="MediaPipe.HandDetector" LastDependency="VL.MediaPipe.vl">
                   <Choice Kind="NodeFlag" Name="Node" Fixed="true" />
-                  <Choice Kind="OperationCallFlag" Name="LandmarkByName" />
+                  <Choice Kind="OperationCallFlag" Name="FingerJointByName" />
                 </p:NodeReference>
                 <p:HelpFocus p:Assembly="VL.Lang" p:Type="VL.Model.HelpPriority">High</p:HelpFocus>
                 <Pin Id="MI0bnI50NxDOZrItZXa9vs" Name="Input" Kind="InputPin" />
-                <Pin Id="AwTSfPSz7cqMD8MqT1HSOp" Name="Landmark" Kind="InputPin" DefaultValue="MiddleFinger_MCP" />
+                <Pin Id="AwTSfPSz7cqMD8MqT1HSOp" Name="Joint" Kind="InputPin" />
                 <Pin Id="HwcMDr247JzPXHMxTGFZp8" Name="Result" Kind="OutputPin" />
               </Node>
               <Node Bounds="555,807,44,19" Id="A7TNKX9RlyvL4Sq4CB7Uc2">
@@ -332,16 +331,16 @@
                 <Pin Id="V6L3NaLtn1VLnQq83ODCa6" Name="Scaling" Kind="InputPin" DefaultValue="0.05" />
                 <Pin Id="FkOAjtatDMDPAin6FWPPFH" Name="Output" Kind="OutputPin" />
               </Node>
-              <Pad Id="AauH8Bkb20TLxbw0wD1nWt" Comment="Landmark" Bounds="526,645,107,15" ShowValueBox="true" isIOBox="true" Value="Pinky_TIP">
-                <p:TypeAnnotation LastCategoryFullName="MediaPipe.HandResults" LastDependency="VL.MediaPipe.vl">
-                  <Choice Kind="TypeFlag" Name="Fingers" />
-                </p:TypeAnnotation>
-              </Pad>
               <Pad Id="SwOk8jlmRRfOMRHhJYZGWp" Comment="Color" Bounds="731,789,20,15" ShowValueBox="true" isIOBox="true" Value="0.28663215, 0.54000014, 0.16740018, 1">
                 <p:TypeAnnotation LastCategoryFullName="Color" LastDependency="VL.CoreLib.vl">
                   <Choice Kind="TypeFlag" Name="RGBA" />
                 </p:TypeAnnotation>
               </Pad>
+              <Pad Id="N7tLATW8dRWNd7YmRWJUyG" Comment="Joint" Bounds="538,645,107,15" ShowValueBox="true" isIOBox="true" Value="Pinky_TIP">
+                <p:TypeAnnotation LastCategoryFullName="MediaPipe.HandResults" LastDependency="VL.MediaPipe.vl">
+                  <Choice Kind="TypeFlag" Name="FingerJoints" />
+                </p:TypeAnnotation>
+              </Pad>
             </Patch>
           </Node>
           <Node Bounds="552,865,44,19" Id="J7oOsreutvbMsn8lT7j71N">
@@ -417,8 +416,8 @@
         <Link Id="Akr9f81WmiZQS8yDNb7EcN" Ids="NBVx7h8nw5SPcSvDqFXf9j,QTun2Ev0v0iMVAY78nKcYS" />
         <Link Id="PpOb4vtEq7JLliiCWz3h9F" Ids="AZLkVBSEDMzLhTnPASzmNM,MEaS5dvYXZNPaZhJtRuq5P" />
         <Link Id="RJZJdFBeT0fNuQ0wOEnoZk" Ids="FkOAjtatDMDPAin6FWPPFH,MSE4OfVbgLENzYu9tink2O" />
-        <Link Id="BrjgG5HSxRnQMtiYoxrFcM" Ids="AauH8Bkb20TLxbw0wD1nWt,AwTSfPSz7cqMD8MqT1HSOp" />
         <Link Id="CMdqGHVlsspQFEcoZJEA2k" Ids="SwOk8jlmRRfOMRHhJYZGWp,JE2XVLIL7DhLRTUD2A1QUw" />
+        <Link Id="O48hZ10Q9nBMf2l75CbPz3" Ids="N7tLATW8dRWNd7YmRWJUyG,AwTSfPSz7cqMD8MqT1HSOp" />
       </Patch>
     </Node>
   </Patch>