TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 16:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Temp add the convertRotation handler so we dont need the oculus files

Browse source
This commit is contained in:
James Urquhart 2016-05-01 00:30:25 +01:00
parent b58f34da9b
commit b15be28f38
1 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Engine/source/platform/input/openVR/openVRProvider.cpp
View file

@ -22,7 +22,26 @@
#include "gfx/gl/gfxGLEnumTranslate.h" #include "gfx/gl/gfxGLEnumTranslate.h"
*/ */
#include "platform/input/oculusVR/oculusVRUtil.h" namespace OpenVRUtil
{
/// Convert an OVR sensor's rotation to a Torque 3D matrix
void convertRotation(const F32 inRotMat[4][4], MatrixF& outRotation)
{
// Set rotation. We need to convert from sensor coordinates to
// Torque coordinates. The sensor matrix is stored row-major.
// The conversion is:
//
// Sensor Torque
// a b c a b c a -c b
// d e f --> -g -h -i --> -g i -h
// g h i d e f d -f e
outRotation.setColumn(0, Point4F( inRotMat[0][0], -inRotMat[2][0], inRotMat[1][0], 0.0f));
outRotation.setColumn(1, Point4F(-inRotMat[0][2], inRotMat[2][2], -inRotMat[1][2], 0.0f));
outRotation.setColumn(2, Point4F( inRotMat[0][1], -inRotMat[2][1], inRotMat[1][1], 0.0f));
outRotation.setPosition(Point3F::Zero);
}
}
//------------------------------------------------------------ //------------------------------------------------------------
@ -562,7 +581,7 @@ void OpenVRTransformToRotPos(MatrixF mat, QuatF &outRot, Point3F &outPos)
inRotMat[3][2] = col3.z; inRotMat[3][2] = col3.z;
inRotMat[3][3] = col3.w; inRotMat[3][3] = col3.w;
OculusVRUtil::convertRotation(inRotMat, torqueMat); OpenVRUtil::convertRotation(inRotMat, torqueMat);
Point3F pos = torqueMat.getPosition(); Point3F pos = torqueMat.getPosition();
outRot = QuatF(torqueMat); outRot = QuatF(torqueMat);