The open source OpenXR runtime
d/ht: Tidy includes
+83
-85
+5
-4
src/xrt/drivers/ht/ht_algorithm.hpp
+5
-4
src/xrt/drivers/ht/ht_algorithm.hpp
···
9
9
10
10
#pragma once
11
11
12
-
#include "ht_driver.hpp"
12
+
#include "util/u_frame.h"
13
13
14
-
#include "util/u_frame.h"
14
+
#include "templates/NaivePermutationSort.hpp"
15
15
16
-
#include "ht_image_math.hpp"
16
+
#include "ht_driver.hpp"
17
17
#include "ht_models.hpp"
18
18
#include "ht_hand_math.hpp"
19
-
#include "templates/NaivePermutationSort.hpp"
19
+
#include "ht_image_math.hpp"
20
+
20
21
#include <opencv2/imgproc.hpp>
21
22
22
23
+27
-36
src/xrt/drivers/ht/ht_driver.cpp
+27
-36
src/xrt/drivers/ht/ht_driver.cpp
···
8
8
* @ingroup drv_ht
9
9
*/
10
10
11
-
#include "ht_driver.hpp"
11
+
#include "xrt/xrt_defines.h"
12
+
#include "xrt/xrt_frameserver.h"
13
+
14
+
#include "os/os_time.h"
15
+
#include "os/os_threading.h"
16
+
12
17
#include "math/m_api.h"
18
+
#include "math/m_eigen_interop.hpp"
19
+
13
20
#include "util/u_device.h"
14
21
#include "util/u_frame.h"
15
22
#include "util/u_sink.h"
16
23
#include "util/u_format.h"
17
-
#include "tracking/t_frame_cv_mat_wrapper.hpp"
18
-
#include <cjson/cJSON.h>
19
-
#include <opencv2/core/mat.hpp>
20
-
#include <unistd.h>
21
-
22
-
#include "templates/NaivePermutationSort.hpp"
23
-
24
-
#include "opencv2/calib3d.hpp"
25
-
#include "opencv2/highgui.hpp"
26
-
#include "os/os_threading.h"
27
-
#include "os/os_time.h"
24
+
#include "util/u_logging.h"
25
+
#include "util/u_time.h"
26
+
#include "util/u_trace_marker.h"
28
27
#include "util/u_time.h"
29
28
#include "util/u_json.h"
30
29
#include "util/u_config_json.h"
31
30
32
-
#include "math/m_eigen_interop.hpp"
33
-
34
-
35
-
36
-
// #include <asm-generic/errno-base.h>
37
-
38
-
#include "vive/vive_config.h"
39
-
31
+
#include "tracking/t_frame_cv_mat_wrapper.hpp"
40
32
#include "tracking/t_calibration_opencv.hpp"
41
33
42
-
#include "util/u_logging.h"
43
-
#include "util/u_time.h"
44
-
#include "util/u_trace_marker.h"
45
-
#include "xrt/xrt_defines.h"
34
+
#include "templates/NaivePermutationSort.hpp"
46
35
36
+
#include "ht_driver.hpp"
47
37
#include "ht_algorithm.hpp"
48
-
#include "xrt/xrt_frameserver.h"
49
38
50
-
// #include <opencv2/imgproc.hpp>
51
-
#include <string.h>
52
-
#include <stdio.h>
53
-
#include <math.h>
39
+
#include <cjson/cJSON.h>
40
+
#include <opencv2/core/mat.hpp>
41
+
#include <opencv2/calib3d.hpp>
54
42
43
+
#include <math.h>
55
44
#include <float.h>
56
-
45
+
#include <stdio.h>
46
+
#include <unistd.h>
47
+
#include <string.h>
57
48
49
+
#include <cmath>
58
50
59
-
#include <exception>
51
+
#include <limits>
52
+
#include <thread>
53
+
#include <future>
60
54
#include <fstream>
61
-
#include <iostream>
62
-
#include <limits>
63
55
#include <numeric>
64
-
#include <cmath>
65
56
#include <sstream>
57
+
#include <iostream>
58
+
#include <exception>
66
59
#include <algorithm>
67
60
68
-
#include <thread>
69
-
#include <future>
70
61
71
62
/*!
72
63
* Setup helper functions.
+9
-13
src/xrt/drivers/ht/ht_driver.hpp
+9
-13
src/xrt/drivers/ht/ht_driver.hpp
···
9
9
10
10
#pragma once
11
11
12
-
13
-
#include "math/m_api.h"
14
-
#include "math/m_vec3.h"
15
-
16
-
#include "math/m_filter_one_euro.h"
12
+
#include "os/os_threading.h"
17
13
18
14
#include "xrt/xrt_device.h"
19
15
#include "xrt/xrt_prober.h"
20
16
#include "xrt/xrt_frame.h"
21
17
#include "xrt/xrt_frameserver.h"
22
18
19
+
#include "math/m_api.h"
20
+
#include "math/m_vec3.h"
21
+
#include "math/m_filter_one_euro.h"
22
+
23
23
#include "util/u_var.h"
24
-
#include "util/u_debug.h"
24
+
#include "util/u_json.h"
25
25
#include "util/u_sink.h"
26
+
#include "util/u_debug.h"
26
27
#include "util/u_device.h"
27
28
28
-
#include "os/os_threading.h"
29
+
#include "templates/DiscardLastBuffer.hpp"
29
30
30
-
#include <future>
31
31
#include <opencv2/opencv.hpp>
32
32
33
33
#include "core/session/onnxruntime_c_api.h"
34
34
35
-
#include "templates/DiscardLastBuffer.hpp"
36
-
37
-
#include "util/u_json.h"
38
-
35
+
#include <future>
39
36
#include <vector>
40
-
41
37
42
38
43
39
DEBUG_GET_ONCE_LOG_OPTION(ht_log, "HT_LOG", U_LOGGING_WARN)
+4
-1
src/xrt/drivers/ht/ht_hand_math.hpp
+4
-1
src/xrt/drivers/ht/ht_hand_math.hpp
+7
-4
src/xrt/drivers/ht/ht_image_math.hpp
+7
-4
src/xrt/drivers/ht/ht_image_math.hpp
···
8
8
*/
9
9
10
10
#pragma once
11
-
#include "ht_driver.hpp"
11
+
12
+
#include "xrt/xrt_defines.h"
12
13
#include "math/m_api.h"
13
14
#include "math/m_vec2.h"
14
15
#include "math/m_vec3.h"
15
-
#include "xrt/xrt_defines.h"
16
+
17
+
#include "ht_driver.hpp"
18
+
16
19
#include <opencv2/calib3d.hpp>
20
+
#include <opencv2/imgproc.hpp>
21
+
#include <opencv2/core/types.hpp>
17
22
18
-
#include <opencv2/core/types.hpp>
19
-
#include <opencv2/imgproc.hpp>
20
23
21
24
static cv::Scalar
22
25
hsv2rgb(float fH, float fS, float fV)
+4
-3
src/xrt/drivers/ht/ht_interface.h
+4
-3
src/xrt/drivers/ht/ht_interface.h
···
10
10
11
11
#pragma once
12
12
13
-
#include "math/m_api.h"
14
-
#include "xrt/xrt_defines.h"
15
13
#include "xrt/xrt_device.h"
16
-
#include "vive/vive_config.h"
14
+
17
15
18
16
#ifdef __cplusplus
19
17
extern "C" {
20
18
#endif
19
+
20
+
struct t_stereo_camera_calibration;
21
+
21
22
22
23
/*!
23
24
* @defgroup drv_ht Camera based hand tracking
+21
-22
src/xrt/drivers/ht/ht_models.hpp
+21
-22
src/xrt/drivers/ht/ht_models.hpp
···
13
13
14
14
#pragma once
15
15
16
+
#include "os/os_time.h"
17
+
#include "os/os_threading.h"
18
+
16
19
#include "math/m_api.h"
17
20
#include "math/m_vec2.h"
18
21
#include "math/m_vec3.h"
19
-
#include "opencv2/calib3d.hpp"
20
-
#include "opencv2/highgui.hpp"
21
-
#include "os/os_threading.h"
22
-
#include "os/os_time.h"
23
-
#include "util/u_json.h"
24
22
25
-
26
-
#include "../depthai/depthai_interface.h"
27
-
#include "../vf/vf_interface.h"
23
+
#include "util/u_json.h"
24
+
#include "util/u_time.h"
25
+
#include "util/u_logging.h"
26
+
#include "util/u_trace_marker.h"
28
27
29
-
#include <cjson/cJSON.h>
30
-
28
+
#include "ht_nms.hpp"
31
29
#include "ht_driver.hpp"
32
-
#include "ht_nms.hpp"
33
-
#include "util/u_logging.h"
34
-
#include "util/u_time.h"
35
-
#include "util/u_trace_marker.h"
36
30
#include "ht_image_math.hpp"
37
31
38
32
#include <core/session/onnxruntime_c_api.h>
39
-
#include <cstdlib>
33
+
40
34
#include <opencv2/core/types.hpp>
35
+
#include <opencv2/calib3d.hpp>
41
36
#include <opencv2/imgproc.hpp>
37
+
38
+
#include <math.h>
39
+
#include <stdio.h>
42
40
#include <string.h>
43
-
#include <stdio.h>
44
-
#include <math.h>
41
+
42
+
#include <cmath>
43
+
#include <cstdlib>
45
44
46
-
#include <exception>
47
-
#include <fstream>
48
-
#include <iostream>
45
+
#include <vector>
49
46
#include <limits>
50
47
#include <numeric>
51
-
#include <cmath>
52
48
#include <sstream>
53
-
#include <vector>
49
+
#include <fstream>
50
+
#include <iostream>
51
+
#include <exception>
52
+
54
53
55
54
#define ORT_CHECK(g_ort, expr) \
56
55
do { \
+6
-2
src/xrt/drivers/ht/ht_nms.hpp
+6
-2
src/xrt/drivers/ht/ht_nms.hpp