aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMike Turvey <mturvey6@gmail.com>2018-01-15 22:40:14 -0700
committerMike Turvey <mturvey6@gmail.com>2018-01-15 22:40:14 -0700
commitb2eb7569a8963917116c4520e15b17f0578a2509 (patch)
tree0d9eea391f3b266bcb80c47131092e0dbf317600 /src
parent7817da63526f35d10d6d4f6b3d9c02280719e023 (diff)
downloadlibsurvive-b2eb7569a8963917116c4520e15b17f0578a2509.tar.gz
libsurvive-b2eb7569a8963917116c4520e15b17f0578a2509.tar.bz2
Fix a few warnings
Diffstat (limited to 'src')
-rw-r--r--src/ootx_decoder.c2
-rw-r--r--src/poser_turveytori.c5
2 files changed, 4 insertions, 3 deletions
diff --git a/src/ootx_decoder.c b/src/ootx_decoder.c
index f7a7938..7bf7d7e 100644
--- a/src/ootx_decoder.c
+++ b/src/ootx_decoder.c
@@ -44,7 +44,7 @@ void ootx_free_decoder_context(ootx_decoder_context *ctx) {
}
uint8_t ootx_decode_bit(uint32_t length) {
- uint8_t t = (length - 2750) / 500; //why 2750?
+ uint8_t t = (uint8_t)((length - 2750) / 500); //why 2750?
// return ((t & 0x02)>0)?0xFF:0x00; //easier if we need to bitshift right
return ((t & 0x02)>>1);
}
diff --git a/src/poser_turveytori.c b/src/poser_turveytori.c
index de1516a..94d572e 100644
--- a/src/poser_turveytori.c
+++ b/src/poser_turveytori.c
@@ -1050,7 +1050,7 @@ static void WhereIsTheTrackedObjectQuaternion(FLT *posOut, FLT *rotation, Point
quatgetreciprocal(inverseRotation, rotation);
- FLT objPoint[3] = { lhPoint.x, lhPoint.y, lhPoint.z };
+ //FLT objPoint[3] = { lhPoint.x, lhPoint.y, lhPoint.z };
//rotatearoundaxis(objPoint, objPoint, reverseRotation, reverseRotation[3]);
quatrotatevector(posOut, inverseRotation, posOut);
@@ -1186,7 +1186,7 @@ void SolveForRotation(FLT rotOut[4], TrackedObject *obj, Point lh)
// Step 1, create initial quaternion for guess.
// This should have the lighthouse directly facing the tracked object.
- Point trackedObjRelativeToLh = { .x = -lh.x,.y = -lh.y,.z = -lh.z };
+ //Point trackedObjRelativeToLh = { .x = -lh.x,.y = -lh.y,.z = -lh.z };
FLT theta = atan2(-lh.x, -lh.y);
FLT zAxis[4] = { 0, 0, 1 , theta - LINMATHPI / 2 };
FLT quat1[4];
@@ -1200,6 +1200,7 @@ void SolveForRotation(FLT rotOut[4], TrackedObject *obj, Point lh)
RefineRotationEstimateAxisAngle(rotOut, lh, zAxis, obj);
+ // TODO: Need to use the quaternion version here!!!
//// Step 2, optimize the quaternion to match the data.
//RefineRotationEstimateQuaternion(rotOut, lh, quat1, obj);