Renaming ypr value name to quat

parent f783149f
...@@ -2208,7 +2208,7 @@ void get_sound_receiver_orientation_view_up( int nlhs, mxArray *plhs[], int nrhs ...@@ -2208,7 +2208,7 @@ void get_sound_receiver_orientation_view_up( int nlhs, mxArray *plhs[], int nrhs
REGISTER_PUBLIC_FUNCTION( get_sound_receiver_pose, "Returns the position and orientation of a sound receiver", "" ); REGISTER_PUBLIC_FUNCTION( get_sound_receiver_pose, "Returns the position and orientation of a sound receiver", "" );
DECLARE_FUNCTION_REQUIRED_INARG( get_sound_receiver_pose, soundreceiverID, "integer-1x1", "Sound receiver ID" ); DECLARE_FUNCTION_REQUIRED_INARG( get_sound_receiver_pose, soundreceiverID, "integer-1x1", "Sound receiver ID" );
DECLARE_FUNCTION_OUTARG( get_sound_receiver_pose, pos, "double-3", "Position vector [x,y,z] (unit: meters)" ); DECLARE_FUNCTION_OUTARG( get_sound_receiver_pose, pos, "double-3", "Position vector [x,y,z] (unit: meters)" );
DECLARE_FUNCTION_OUTARG( get_sound_receiver_pose, ypr, "double-4", "Rotation quaternion [w,x,y,z]" ); DECLARE_FUNCTION_OUTARG( get_sound_receiver_pose, quat, "double-4", "Rotation quaternion [w,x,y,z]" );
void get_sound_receiver_pose( int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[] ) { void get_sound_receiver_pose( int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[] ) {
...@@ -2304,7 +2304,7 @@ void set_sound_receiver_orientation_view_up( int nlhs, mxArray *plhs[], int nrhs ...@@ -2304,7 +2304,7 @@ void set_sound_receiver_orientation_view_up( int nlhs, mxArray *plhs[], int nrhs
REGISTER_PUBLIC_FUNCTION( set_sound_receiver_pose, "Sets the position and orientation (in yaw-pitch-roll angles) of a sound receiver", "" ); REGISTER_PUBLIC_FUNCTION( set_sound_receiver_pose, "Sets the position and orientation (in yaw-pitch-roll angles) of a sound receiver", "" );
DECLARE_FUNCTION_REQUIRED_INARG( set_sound_receiver_pose, soundreceiverID, "integer-1x1", "Sound receiver ID" ); DECLARE_FUNCTION_REQUIRED_INARG( set_sound_receiver_pose, soundreceiverID, "integer-1x1", "Sound receiver ID" );
DECLARE_FUNCTION_REQUIRED_INARG( set_sound_receiver_pose, pos, "double-3", "Position vector [x, y, z] (unit: meters)" ); DECLARE_FUNCTION_REQUIRED_INARG( set_sound_receiver_pose, pos, "double-3", "Position vector [x, y, z] (unit: meters)" );
DECLARE_FUNCTION_REQUIRED_INARG( set_sound_receiver_pose, ypr, "double-4", "Rotation angles [w,x,y,z]" ); DECLARE_FUNCTION_REQUIRED_INARG( set_sound_receiver_pose, quat, "double-4", "Rotation angles [w,x,y,z]" );
void set_sound_receiver_pose( int, mxArray *[], int nrhs, const mxArray *prhs[] ) void set_sound_receiver_pose( int, mxArray *[], int nrhs, const mxArray *prhs[] )
{ {
REQUIRE_INPUT_ARGS( 4 ); REQUIRE_INPUT_ARGS( 4 );
...@@ -2316,7 +2316,7 @@ void set_sound_receiver_pose( int, mxArray *[], int nrhs, const mxArray *prhs[] ...@@ -2316,7 +2316,7 @@ void set_sound_receiver_pose( int, mxArray *[], int nrhs, const mxArray *prhs[]
VAVec3 v3Pos; VAVec3 v3Pos;
VAQuat qOrient; VAQuat qOrient;
matlabGetRealVector3( prhs[ 2 ], "pos", v3Pos ); matlabGetRealVector3( prhs[ 2 ], "pos", v3Pos );
matlabGetQuaternion( prhs[ 3 ], "ypr", qOrient ); matlabGetQuaternion( prhs[ 3 ], "quat", qOrient );
pConnection->pCoreInterface->SetSoundReceiverPose( isoundreceiverID, v3Pos, qOrient ); pConnection->pCoreInterface->SetSoundReceiverPose( isoundreceiverID, v3Pos, qOrient );
} }
......
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