Skip to content

Commit ca25664

Browse files
committed
v1.0.3 MRTKv2 support.
Hololens 10.0.17763.914 (RS5) Windows 10 SDK 10.0.18362.0 Visual Studio 2017 or 2019 Unity 2018.4.7f1+ Microsoft Mixed Reality Toolkit v2.2.0 OpenCVForUnity 2.3.7+ HoloLensCameraStream
1 parent d435038 commit ca25664

39 files changed

+5451
-4295
lines changed

Assets/HoloLensWithOpenCVForUnityExample/HoloLensArUcoExample/CameraParameters.cs

+13-13
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace HoloLensWithOpenCVForUnityExample
66
[System.Serializable]
77
public struct CameraParameters
88
{
9-
public string calibration_date;
9+
public string calibration_date;
1010
public int frames_count;
1111
public int image_width;
1212
public int image_height;
@@ -15,9 +15,9 @@ public struct CameraParameters
1515
public double[] distortion_coefficients;
1616
public double avg_reprojection_error;
1717

18-
public CameraParameters (int frames_count, int image_width, int image_height, int calibration_flags, double[] camera_matrix, double[] distortion_coefficients, double avg_reprojection_error)
18+
public CameraParameters(int frames_count, int image_width, int image_height, int calibration_flags, double[] camera_matrix, double[] distortion_coefficients, double avg_reprojection_error)
1919
{
20-
this.calibration_date = DateTime.Now.ToString ();
20+
this.calibration_date = DateTime.Now.ToString();
2121
this.frames_count = frames_count;
2222
this.image_width = image_width;
2323
this.image_height = image_height;
@@ -27,15 +27,15 @@ public CameraParameters (int frames_count, int image_width, int image_height, in
2727
this.avg_reprojection_error = avg_reprojection_error;
2828
}
2929

30-
public CameraParameters (int frames_count, int image_width, int image_height, int calibration_flags, Mat camera_matrix, Mat distortion_coefficients, double avg_reprojection_error)
30+
public CameraParameters(int frames_count, int image_width, int image_height, int calibration_flags, Mat camera_matrix, Mat distortion_coefficients, double avg_reprojection_error)
3131
{
3232
double[] camera_matrixArr = new double[camera_matrix.total()];
33-
camera_matrix.get (0, 0, camera_matrixArr);
33+
camera_matrix.get(0, 0, camera_matrixArr);
3434

3535
double[] distortion_coefficientsArr = new double[distortion_coefficients.total()];
36-
distortion_coefficients.get (0, 0, distortion_coefficientsArr);
36+
distortion_coefficients.get(0, 0, distortion_coefficientsArr);
3737

38-
this.calibration_date = DateTime.Now.ToString ();
38+
this.calibration_date = DateTime.Now.ToString();
3939
this.frames_count = frames_count;
4040
this.image_width = image_width;
4141
this.image_height = image_height;
@@ -45,17 +45,17 @@ public CameraParameters (int frames_count, int image_width, int image_height, in
4545
this.avg_reprojection_error = avg_reprojection_error;
4646
}
4747

48-
public Mat GetCameraMatrix ()
48+
public Mat GetCameraMatrix()
4949
{
50-
Mat m = new Mat (3, 3, CvType.CV_64FC1);
51-
m.put (0, 0, camera_matrix);
50+
Mat m = new Mat(3, 3, CvType.CV_64FC1);
51+
m.put(0, 0, camera_matrix);
5252
return m;
5353
}
5454

55-
public Mat GetDistortionCoefficients ()
55+
public Mat GetDistortionCoefficients()
5656
{
57-
Mat m = new Mat (distortion_coefficients.Length, 1, CvType.CV_64FC1);
58-
m.put (0, 0, distortion_coefficients);
57+
Mat m = new Mat(distortion_coefficients.Length, 1, CvType.CV_64FC1);
58+
m.put(0, 0, distortion_coefficients);
5959
return m;
6060
}
6161
}

0 commit comments

Comments
 (0)