Merge branch 'master' of github.com:opentrack/opentrack

Conflicts:
	facetracknoir/tracker.cpp
	ftnoir_filter_accela/ftnoir_filter_accela.cpp
	ftnoir_filter_accela/ftnoir_filter_accela.h
	ftnoir_filter_base/ftnoir_filter_base.h
	ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp
	ftnoir_filter_ewma2/ftnoir_filter_ewma2.h

1 files changed, 83 insertions, 83 deletions

diff --git a/ftnoir_tracker_pt/ftnoir_tracker_pt_settings.h b/ftnoir_tracker_pt/ftnoir_tracker_pt_settings.h
index 88162c86..a1523898 100644
--- a/ftnoir_tracker_pt/ftnoir_tracker_pt_settings.h
+++ b/ftnoir_tracker_pt/ftnoir_tracker_pt_settings.h
@@ -1,84 +1,84 @@
-/* Copyright (c) 2012 Patrick Ruoff

- *

- * 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.

- */

-

-#ifndef FTNOIR_TRACKER_PT_SETTINGS_H

-#define FTNOIR_TRACKER_PT_SETTINGS_H

-

-#include <opencv2/opencv.hpp>

-#include "point_tracker.h"

-

-

-//-----------------------------------------------------------------------------

-struct TrackerSettings

-{	

-	// camera

-	int cam_index;

-	float cam_f;

-	int cam_res_x;

-	int cam_res_y;

-	int cam_fps;

-	int cam_pitch;

-

-	// point extraction

-	int threshold;

-	int min_point_size;

-	int max_point_size;

-

-	// point tracking

-	cv::Vec3f M01;

-	cv::Vec3f M02;

-	bool dyn_pose_res;

-

-	// head to model translation

-	cv::Vec3f t_MH;

-

-	int sleep_time; // in ms

-	int reset_time; // in ms

-	bool video_widget;

-

-	bool bEnableRoll;

-	bool bEnablePitch;

-	bool bEnableYaw;

-	bool bEnableX;

-	bool bEnableY;

-	bool bEnableZ;

-

-	void load_ini();

-	void save_ini() const;

-};

-

-

-//-----------------------------------------------------------------------------

-struct TrackerDialogSettings

-{

-	enum

-	{

-		MODEL_CLIP,

-		MODEL_CAP,

-		MODEL_CUSTOM

-	};

-	int active_model_panel;

-

-	int M01x;

-	int M01y;

-	int M01z;

-	int M02x;

-	int M02y;

-	int M02z;

-	int clip_ty;

-	int clip_tz;

-	int clip_by;

-	int clip_bz;

-	int cap_x;

-	int cap_y;

-	int cap_z;

-

-	void load_ini();

-	void save_ini() const;

-};

-

+/* Copyright (c) 2012 Patrick Ruoff
+ *
+ * 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.
+ */
+
+#ifndef FTNOIR_TRACKER_PT_SETTINGS_H
+#define FTNOIR_TRACKER_PT_SETTINGS_H
+
+#include <opencv2/opencv.hpp>
+#include "point_tracker.h"
+
+
+//-----------------------------------------------------------------------------
+struct TrackerSettings
+{	
+	// camera
+	int cam_index;
+	float cam_f;
+	int cam_res_x;
+	int cam_res_y;
+	int cam_fps;
+	int cam_pitch;
+
+	// point extraction
+	int threshold;
+	int min_point_size;
+	int max_point_size;
+
+	// point tracking
+	cv::Vec3f M01;
+	cv::Vec3f M02;
+	bool dyn_pose_res;
+
+	// head to model translation
+	cv::Vec3f t_MH;
+
+	int sleep_time; // in ms
+	int reset_time; // in ms
+	bool video_widget;
+
+	bool bEnableRoll;
+	bool bEnablePitch;
+	bool bEnableYaw;
+	bool bEnableX;
+	bool bEnableY;
+	bool bEnableZ;
+
+	void load_ini();
+	void save_ini() const;
+};
+
+
+//-----------------------------------------------------------------------------
+struct TrackerDialogSettings
+{
+	enum
+	{
+		MODEL_CLIP,
+		MODEL_CAP,
+		MODEL_CUSTOM
+	};
+	int active_model_panel;
+
+	int M01x;
+	int M01y;
+	int M01z;
+	int M02x;
+	int M02y;
+	int M02z;
+	int clip_ty;
+	int clip_tz;
+	int clip_by;
+	int clip_bz;
+	int cap_x;
+	int cap_y;
+	int cap_z;
+
+	void load_ini();
+	void save_ini() const;
+};
+
 #endif //FTNOIR_TRACKER_PT_SETTINGS_H
\ No newline at end of file