Refactoring

parent 80626278
This diff is collapsed.
...@@ -40,7 +40,7 @@ void TrackerDataHandler( sFrameOfMocapData* sFrame, void* pUserData ) ...@@ -40,7 +40,7 @@ void TrackerDataHandler( sFrameOfMocapData* sFrame, void* pUserData )
{ {
try try
{ {
VistaVector3D vPosOffsetLocalCoordinateSystem = pVAMatlabTracker->vTrackedListenerTranslation; VistaVector3D vPosOffsetLocalCoordinateSystem = pVAMatlabTracker->vTrackedSoundReceiverTranslation;
VistaQuaternion qOrientRotation = pVAMatlabTracker->qTrackedListenerRotation; VistaQuaternion qOrientRotation = pVAMatlabTracker->qTrackedListenerRotation;
const sRigidBodyData& oBodyData( sFrame->RigidBodies[ iTrackedReceiverRigidBodyIndex - 1 ] ); const sRigidBodyData& oBodyData( sFrame->RigidBodies[ iTrackedReceiverRigidBodyIndex - 1 ] );
...@@ -137,7 +137,7 @@ void CVAMatlabTracker::Reset() ...@@ -137,7 +137,7 @@ void CVAMatlabTracker::Reset()
{ {
iTrackedSoundReceiverID = -1; iTrackedSoundReceiverID = -1;
iTrackedListenerRigidBodyIndex = 1; iTrackedListenerRigidBodyIndex = 1;
vTrackedListenerTranslation.SetToZeroVector(); vTrackedSoundReceiverTranslation.SetToZeroVector();
qTrackedListenerRotation.SetToNeutralQuaternion(); qTrackedListenerRotation.SetToNeutralQuaternion();
iTrackedRealWorldSoundReceiverID = -1; iTrackedRealWorldSoundReceiverID = -1;
......
...@@ -39,7 +39,7 @@ public: ...@@ -39,7 +39,7 @@ public:
int iTrackedSoundReceiverID; //!< -1 if deactivated, will be preferred over source int iTrackedSoundReceiverID; //!< -1 if deactivated, will be preferred over source
int iTrackedListenerRigidBodyIndex; //!< Starts with 1 (default) int iTrackedListenerRigidBodyIndex; //!< Starts with 1 (default)
VistaVector3D vTrackedListenerTranslation; //!< Position offset from pivot point (default NatNet rigid body barycenter) VistaVector3D vTrackedSoundReceiverTranslation; //!< Position offset from pivot point (default NatNet rigid body barycenter)
VistaQuaternion qTrackedListenerRotation; //!< Orientation rotation from default orientation (initial NatNet rigid body orientation) VistaQuaternion qTrackedListenerRotation; //!< Orientation rotation from default orientation (initial NatNet rigid body orientation)
int iTrackedRealWorldSoundReceiverID; //!< -1 if deactivated int iTrackedRealWorldSoundReceiverID; //!< -1 if deactivated
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment