summaryrefslogtreecommitdiffhomepage
path: root/FTNoIR_Tracker_PT/camera.h
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2013-12-30 15:40:24 +0100
committerStanislaw Halik <sthalik@misaki.pl>2013-12-30 15:40:24 +0100
commitb7eb4245fe6dc261a926d31331b2af3fec959401 (patch)
tree19517bd146ae25a10c45ab0878f67ea38cc4a92b /FTNoIR_Tracker_PT/camera.h
parent6adbfba397237340a2db9d1b0b4c7726cc5df94c (diff)
pt: use new settings framework, cleanup
Diffstat (limited to 'FTNoIR_Tracker_PT/camera.h')
-rw-r--r--FTNoIR_Tracker_PT/camera.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/FTNoIR_Tracker_PT/camera.h b/FTNoIR_Tracker_PT/camera.h
index 78fe8dfb..ea68c387 100644
--- a/FTNoIR_Tracker_PT/camera.h
+++ b/FTNoIR_Tracker_PT/camera.h
@@ -69,13 +69,13 @@ protected:
virtual void _set_fps() = 0;
virtual void _set_res() = 0;
- bool active;
+ float dt_valid;
+ float dt_mean;
int desired_index;
int active_index;
+ bool active;
CamInfo cam_info;
CamInfo cam_desired;
- float dt_valid;
- float dt_mean;
};
@@ -128,9 +128,9 @@ protected:
enum RotationType
{
- CLOCKWISE = -1,
- ZERO = 0,
- COUNTER_CLOCKWISE = 1
+ CLOCKWISE = 0,
+ ZERO = 1,
+ COUNTER_CLOCKWISE = 2
};
// ----------------------------------------------------------------------------