소스 검색

calibration points are calculated by random

Alexander Hendrich 10 년 전
부모
커밋
615f2ac7b4
2개의 변경된 파일11개의 추가작업 그리고 6개의 파일을 삭제
  1. 8 3
      bbiwarg/Output/GlassesOutput/GlassesWindow.cs
  2. 3 3
      bbiwarg/Parameters.cs

+ 8 - 3
bbiwarg/Output/GlassesOutput/GlassesWindow.cs

@@ -42,11 +42,16 @@ namespace bbiwarg.Output.GlassesOutput
             guiUpToDate = false;
             calibrationImageUpToDate = false;
 
+            Random rand = new Random();
             calibrationPoints = new List<Vector2D>();
-            calibrationPoints.Add(outputSize.getAbsolutePoint(new Vector2D(0.25f, 0.25f)));
+
+            for (int i = 0; i < 4; i++)
+                calibrationPoints.Add(outputSize.getAbsolutePoint(new Vector2D((float)rand.NextDouble(), (float)rand.NextDouble())));
+
+            /*calibrationPoints.Add(outputSize.getAbsolutePoint(new Vector2D(0.25f, 0.25f)));
             calibrationPoints.Add(outputSize.getAbsolutePoint(new Vector2D(0.75f, 0.25f)));
             calibrationPoints.Add(outputSize.getAbsolutePoint(new Vector2D(0.75f, 0.75f)));
-            calibrationPoints.Add(outputSize.getAbsolutePoint(new Vector2D(0.25f, 0.75f)));
+            calibrationPoints.Add(outputSize.getAbsolutePoint(new Vector2D(0.25f, 0.75f)));*/
             calibrationPointIndex = 0;
             projection = new Projection2DTo2D(inputSize, outputSize, calibrationPoints.Count);
 
@@ -142,7 +147,7 @@ namespace bbiwarg.Output.GlassesOutput
                 image.Dispose();
 
             image = new OutputImage(outputSize);
-            image.fillCircle(calibrationPoints[calibrationPointIndex], 50, Color.Orange);
+            image.fillCircle(calibrationPoints[calibrationPointIndex], 25, Color.Orange);
         }
 
         private void updateGUI()

+ 3 - 3
bbiwarg/Parameters.cs

@@ -23,7 +23,7 @@ namespace bbiwarg
         public static readonly int ConsoleHeight = 30;
 
         // input
-        public static readonly InputType InputSource = InputType.Movie;
+        public static readonly InputType InputSource = InputType.Camera;
         public static readonly String InputMoviePath = "..\\..\\videos\\touch\\4.skv";
 
         // Logger
@@ -36,10 +36,10 @@ namespace bbiwarg
         public static readonly String DebugWindowTitle = "BBIWARG - DebugOutput";
 
         // glasses window
-        public static readonly bool GlassesWindowEnabled = false;
+        public static readonly bool GlassesWindowEnabled = true;
         public static readonly int GlassesWindowUpdateRate = 30;
         public static readonly int GlassesWindowUpdateInterval = 1000 / 30; // 30fps
-        public static readonly ImageSize GlassesWindowOutputSize = new ImageSize(1024, 768);
+        public static readonly ImageSize GlassesWindowOutputSize = new ImageSize(1280, 720);
         public static readonly String GlassesWindowTitle = "BBIWARG - GlassesOutput";
 
         // TUIO