diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2013-04-13 05:45:07 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2013-04-13 05:45:07 +0200 |
| commit | 351e844f6a3c5484acfcf4fb0154bcab6f1780a0 (patch) | |
| tree | e2b1fcb041ae3b763120e3ffb134d529006b0cb2 /ftnoir_tracker_base | |
| parent | 29cf8b9ddf89a42d72ca1c0fbdc9fa93f0c5d189 (diff) | |
Don't use axes as class/struct members. Use an array instead, and iterate over them where applicable.
Diffstat (limited to 'ftnoir_tracker_base')
| -rw-r--r-- | ftnoir_tracker_base/ftnoir_tracker_base.h | 2 | ||||
| -rw-r--r-- | ftnoir_tracker_base/ftnoir_tracker_types.h | 18 |
2 files changed, 3 insertions, 17 deletions
diff --git a/ftnoir_tracker_base/ftnoir_tracker_base.h b/ftnoir_tracker_base/ftnoir_tracker_base.h index 416d3944..b72be93e 100644 --- a/ftnoir_tracker_base/ftnoir_tracker_base.h +++ b/ftnoir_tracker_base/ftnoir_tracker_base.h @@ -56,7 +56,7 @@ struct ITracker {
virtual ~ITracker() {}
virtual void StartTracker( QFrame* frame ) = 0;
- virtual bool GiveHeadPoseData(THeadPoseData *data) = 0;
+ virtual bool GiveHeadPoseData(double *data) = 0;
virtual void WaitForExit() = 0;
};
diff --git a/ftnoir_tracker_base/ftnoir_tracker_types.h b/ftnoir_tracker_base/ftnoir_tracker_types.h index ee443b95..d2981701 100644 --- a/ftnoir_tracker_base/ftnoir_tracker_types.h +++ b/ftnoir_tracker_base/ftnoir_tracker_types.h @@ -30,22 +30,8 @@ #ifndef FTNOIR_TRACKER_TYPES_H
#define FTNOIR_TRACKER_TYPES_H
-//
-// x,y,z position in centimetres, yaw, pitch and roll in degrees...
-//
-#pragma pack(push, 2)
-struct THeadPoseData {
-
- THeadPoseData()
- : x(0.0), y(0.0), z(0.0), yaw(0.0), pitch(0.0), roll(0.0), frame_number(0) {}
-
- THeadPoseData(double x, double y, double z,
- double yaw, double pitch, double roll )
- : x(x), y(y), z(z), yaw(yaw), pitch(pitch), roll(roll), frame_number(0) {}
-
- double x, y, z, yaw, pitch, roll;
- unsigned char frame_number;
+enum Axis {
+ TX = 0, TY, TZ, RX, RY, RZ
};
-#pragma pack(pop)
#endif // FTNOIR_TRACKER_TYPES_H
|