Merge branch 'unstable' into trackhat-ui

5 files changed, 44 insertions, 41 deletions

diff --git a/bin/camera/Logitech HD Webcam C525.yml b/bin/camera/Logitech HD Webcam C525.yml
new file mode 100644
index 00000000..ac1bc981
--- /dev/null
+++ b/bin/camera/Logitech HD Webcam C525.yml
@@ -0,0 +1,22 @@
+%YAML:1.0
+calibration_time: "07/13/15 17:32:58"
+image_width: 640
+image_height: 480
+board_width: 24
+board_height: 15
+square_size: 1.
+flags: 0
+camera_matrix: !!opencv-matrix
+   rows: 3
+   cols: 3
+   dt: d
+   data: [ 7.1195238148354849e+002, 0., 3.4210284784635138e+002, 0.,
+       7.1302752784110055e+002, 2.2837679451205264e+002, 0., 0., 1. ]
+distortion_coefficients: !!opencv-matrix
+   rows: 5
+   cols: 1
+   dt: d
+   data: [ -1.5165615866415242e-003, 3.6806867018034255e-002,
+       -6.6432394998828278e-004, 1.7782694073348656e-003,
+       -4.9225052904494471e-001 ]
+avg_reprojection_error: 2.5310746466741296e+000
diff --git a/bin/camera/PS3Eye Camera.yml b/bin/camera/PS3Eye Camera.yml
new file mode 100644
index 00000000..6859d0fb
--- /dev/null
+++ b/bin/camera/PS3Eye Camera.yml
@@ -0,0 +1,22 @@
+%YAML:1.0
+calibration_time: "07/13/15 17:45:33"
+image_width: 640
+image_height: 480
+board_width: 24
+board_height: 15
+square_size: 1.
+flags: 0
+camera_matrix: !!opencv-matrix
+   rows: 3
+   cols: 3
+   dt: d
+   data: [ 7.5119574967224673e+002, 0., 3.2806930334341007e+002, 0.,
+       7.5112907969240291e+002, 2.2681331450818737e+002, 0., 0., 1. ]
+distortion_coefficients: !!opencv-matrix
+   rows: 5
+   cols: 1
+   dt: d
+   data: [ -2.2741190107950382e-001, 9.4372681451250684e-001,
+       -4.0955586655475494e-003, -2.6778551080439902e-003,
+       -1.7969804313130640e+000 ]
+avg_reprojection_error: 1.9233386799903629e+000
diff --git a/bin/tracker-ht/cleye.config b/bin/tracker-ht/cleye.config
deleted file mode 100644
index bfb37b47..00000000
--- a/bin/tracker-ht/cleye.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cleye>
-    <item name="mode" value="advanced" />
-</cleye>
\ No newline at end of file
diff --git a/bin/tracker-ht/license.txt b/bin/tracker-ht/license.txt
deleted file mode 100644
index a1a778e6..00000000
--- a/bin/tracker-ht/license.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-Copyright (c) 2012-2013 Stanisław Halik <sthalik@misaki.pl>
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-------------------------------------------------------------------------
-
-Credit for the head mesh:
-
-Jed Frechette submitted the mesh as a pull request.
-I cannot thank him enough!
-
-------------------------------------------------------------------------
-
-The project links against the flandmark library, written by
-Michal Uřičář and Vojtěch Franc. The library is GPL3-licensed.
-
-More info at: http://cmp.felk.cvut.cz/~uricamic/flandmark
-Github repo: https://github.com/uricamic/flandmark
-
-------------------------------------------------------------------------
-
-The projects uses OpenCV, see http://code.opencv.org for more info.
\ No newline at end of file
diff --git a/bin/tracker-ht/thanks.txt b/bin/tracker-ht/thanks.txt
deleted file mode 100644
index 42612dfa..00000000
--- a/bin/tracker-ht/thanks.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-The following people deserve thanks for their work on libheadtracker:
-
-The awesome head mesh, made using a 3D scanner was made by
-Jed Frechette. I cannot thank him enough, given how much it
-helped improve the program.
\ No newline at end of file