Just put everything new in. Conflict resolution will be later

1 files changed, 29 insertions, 27 deletions

diff --git a/ftnoir_tracker_ht/ht-api.h b/ftnoir_tracker_ht/ht-api.h
index ac8d45cf..81caf16f 100644
--- a/ftnoir_tracker_ht/ht-api.h
+++ b/ftnoir_tracker_ht/ht-api.h
@@ -1,9 +1,9 @@
 #pragma once
 #ifndef HT_API
 #ifndef __cplusplus
-# define HT_EXTERN 
+# define HT_EXTERN
 #else
-# define HT_EXTERN extern "C" 
+# define HT_EXTERN extern "C"
 #endif
 #   if defined(_WIN32) && !defined(MINGW)
 #     define HT_API(t) HT_EXTERN __declspec(dllexport) t __stdcall
@@ -19,56 +19,58 @@ struct ht_context;
 typedef struct ht_context headtracker_t;
 
 typedef struct ht_config {
-	float field_of_view;
-	float classification_delay;
-	int   pyrlk_pyramids;
-	int   pyrlk_win_size_w;
-	int   pyrlk_win_size_h;
+    float field_of_view;
+    float classification_delay;
+    int   pyrlk_pyramids;
+    int   pyrlk_win_size_w;
+    int   pyrlk_win_size_h;
     float ransac_max_inlier_error;
     float ransac_max_reprojection_error;
-	int   max_keypoints;
+    int   max_keypoints;
     int   keypoint_quality;
-	float keypoint_distance;
+    float keypoint_distance;
     float keypoint_3distance;
     int   force_width;
-	int   force_height;
-	int   force_fps;
-	int   camera_index;
-	bool  debug;
+    int   force_height;
+    int   force_fps;
+    int   camera_index;
+    bool  debug;
     int   ransac_num_iters;
     float ransac_min_features;
     float ransac_max_mean_error;
     float ransac_abs_max_mean_error;
+    bool  user_landmarks;
+    float user_landmark_locations[3][4];
 } ht_config_t;
 
 typedef struct {
     double rotx, roty, rotz;
     double tx, ty, tz;
-	bool filled;
+    bool filled;
 } ht_result_t;
 
 typedef enum {
-	cfg_type_float = 0,
-	cfg_type_int   = 1,
-	cfg_type_bool  = 2,
+    cfg_type_float = 0,
+    cfg_type_int   = 1,
+    cfg_type_bool  = 2,
     cfg_type_double = 3
 } ht_cfg_type_t;
 
 typedef union
 {
-	double d;
-	float f;
-	int i;
+    double d;
+    float f;
+    int i;
 } ht_cfg_value_t;
 
 typedef struct {
-	const char* name;
-	int offset;
-	ht_cfg_type_t type;
-	ht_cfg_value_t default_value;
-	ht_cfg_value_t min;
-	ht_cfg_value_t max;
-	const char* docstring;
+    const char* name;
+    int offset;
+    ht_cfg_type_t type;
+    ht_cfg_value_t default_value;
+    ht_cfg_value_t min;
+    ht_cfg_value_t max;
+    const char* docstring;
 } ht_reflection_t;
 
 typedef struct {