diff --git a/.gitignore b/.gitignore index 57a1574..78ff283 100644 --- a/.gitignore +++ b/.gitignore @@ -19,7 +19,6 @@ x64/ x86/ build/ bld/ -[Bb]in/ [Oo]bj/ # Visual Studo 2015 cache/options directory diff --git a/LiveScanServer/OpenGLWindow.cs b/LiveScanServer/OpenGLWindow.cs index b8e3f64..0201d04 100644 --- a/LiveScanServer/OpenGLWindow.cs +++ b/LiveScanServer/OpenGLWindow.cs @@ -259,7 +259,7 @@ namespace KinectServer if ((DateTime.Now - tFPSUpdateTimer).Seconds >= 1) { double FPS = nTickCounter / (DateTime.Now - tFPSUpdateTimer).TotalSeconds; - //this.Title = "FPS: " + string.Format("{0:F}", FPS); + this.Title = "FPS: " + string.Format("{0:F}", FPS); tFPSUpdateTimer = DateTime.Now; nTickCounter = 0; diff --git a/bin/OpenTK.Compatibility.dll b/bin/OpenTK.Compatibility.dll new file mode 100644 index 0000000..46bbbf7 Binary files /dev/null and b/bin/OpenTK.Compatibility.dll differ diff --git a/bin/OpenTK.GLControl.dll b/bin/OpenTK.GLControl.dll new file mode 100644 index 0000000..8fad65c Binary files /dev/null and b/bin/OpenTK.GLControl.dll differ diff --git a/bin/OpenTK.dll b/bin/OpenTK.dll new file mode 100644 index 0000000..e792eef Binary files /dev/null and b/bin/OpenTK.dll differ diff --git a/bin/opencv_calib3d248.dll b/bin/opencv_calib3d248.dll new file mode 100644 index 0000000..3f34e96 Binary files /dev/null and b/bin/opencv_calib3d248.dll differ diff --git a/bin/opencv_calib3d248d.dll b/bin/opencv_calib3d248d.dll new file mode 100644 index 0000000..d0f1f7a Binary files /dev/null and b/bin/opencv_calib3d248d.dll differ diff --git a/bin/opencv_core248.dll b/bin/opencv_core248.dll new file mode 100644 index 0000000..b87cd79 Binary files /dev/null and b/bin/opencv_core248.dll differ diff --git a/bin/opencv_core248d.dll b/bin/opencv_core248d.dll new file mode 100644 index 0000000..759f48e Binary files /dev/null and b/bin/opencv_core248d.dll differ diff --git a/bin/opencv_features2d248.dll b/bin/opencv_features2d248.dll new file mode 100644 index 0000000..fa64e73 Binary files /dev/null and b/bin/opencv_features2d248.dll differ diff --git a/bin/opencv_features2d248d.dll b/bin/opencv_features2d248d.dll new file mode 100644 index 0000000..48a00a8 Binary files /dev/null and b/bin/opencv_features2d248d.dll differ diff --git a/bin/opencv_flann248.dll b/bin/opencv_flann248.dll new file mode 100644 index 0000000..9b63d8f Binary files /dev/null and b/bin/opencv_flann248.dll differ diff --git a/bin/opencv_flann248d.dll b/bin/opencv_flann248d.dll new file mode 100644 index 0000000..385f71a Binary files /dev/null and b/bin/opencv_flann248d.dll differ diff --git a/bin/opencv_highgui248.dll b/bin/opencv_highgui248.dll new file mode 100644 index 0000000..a83ecac Binary files /dev/null and b/bin/opencv_highgui248.dll differ diff --git a/bin/opencv_highgui248d.dll b/bin/opencv_highgui248d.dll new file mode 100644 index 0000000..b6205c8 Binary files /dev/null and b/bin/opencv_highgui248d.dll differ diff --git a/bin/opencv_imgproc248.dll b/bin/opencv_imgproc248.dll new file mode 100644 index 0000000..13f4a88 Binary files /dev/null and b/bin/opencv_imgproc248.dll differ diff --git a/bin/opencv_imgproc248d.dll b/bin/opencv_imgproc248d.dll new file mode 100644 index 0000000..c54698f Binary files /dev/null and b/bin/opencv_imgproc248d.dll differ diff --git a/src/LiveScanClient/marker.cpp b/src/LiveScanClient/marker.cpp index c8d088e..94608b4 100644 --- a/src/LiveScanClient/marker.cpp +++ b/src/LiveScanClient/marker.cpp @@ -77,9 +77,8 @@ bool MarkerDetector::GetMarker(cv::Mat &img, MarkerInfo &marker) order = false; } - float test = cornersFloat[0].x - cornersFloat[1].x; - - CornersSubPix(cornersFloat, contours[i], order); + //I have commented this out as it crashed for some people, if you want additional accuracy in calibration try to uncomment it. + //CornersSubPix(cornersFloat, contours[i], order); vector cornersFloat2(nMarkerCorners); vector points3D;