فهرست منبع

Revert "Palmdetection now uses tip position."

This reverts commit 73315a0f14e07ed5cbb8f6295c8c59bda396dacb.
Daniel Kauth 11 سال پیش
والد
کامیت
ecdd02ba48
2فایلهای تغییر یافته به همراه7 افزوده شده و 7 حذف شده
  1. 6 6
      bbiwarg/DataSource/PalmDetection.cs
  2. 1 1
      bbiwarg/Main/OutputTest.cs

+ 6 - 6
bbiwarg/DataSource/PalmDetection.cs

@@ -25,15 +25,15 @@ namespace bbiwarg.DataSource
         {
             DenseVector palmMiddle = (DenseVector) input.getPalmPosition3D(handIndex);
             DenseVector thumbPosition = (DenseVector) input.getFingerTipPositions3D(handIndex)[0];
-            DenseVector tipPosition = (DenseVector) input.getTipPosition3D(handIndex);
+            DenseVector foreFingerPosition = (DenseVector)foreFingerDetection.getForeFingerPosition3D(handIndex);
 
             DenseVector palmToThumb_2 = (thumbPosition - palmMiddle) / 2.0f;
-            DenseVector tipToForeFinger = tipPosition - palmMiddle;
+            DenseVector palmToForeFinger = foreFingerPosition - palmMiddle;
 
-            return new Palm(palmMiddle + palmToThumb_2 + tipToForeFinger,
-                            palmMiddle - palmToThumb_2 + tipToForeFinger,
-                            palmMiddle - palmToThumb_2 - tipToForeFinger / 2.0f,
-                            palmMiddle + palmToThumb_2 - tipToForeFinger / 2.0f);
+            return new Palm(palmMiddle + palmToThumb_2 + palmToForeFinger,
+                            palmMiddle - palmToThumb_2 + palmToForeFinger,
+                            palmMiddle - palmToThumb_2 - palmToForeFinger / 2.0f,
+                            palmMiddle + palmToThumb_2 - palmToForeFinger / 2.0f);
         }
     }
 }

+ 1 - 1
bbiwarg/Main/OutputTest.cs

@@ -12,7 +12,7 @@ namespace bbiwarg.Main
     {
         static void Main(string[] args)
         {
-            IInputProvider inputProvider = new IisuInputProvider("..\\..\\videos\\4.skv");
+            IInputProvider inputProvider = new IisuInputProvider("..\\..\\videos\\1.skv");
             IVideoHandle videoHandle = new VideoHandle(inputProvider);
 
             Output output = new Output(videoHandle);