Skip to content

Commit ef66335

Browse files
committed
Swap function names of VMatrixFromHmdMatrix() & VMatrixToHmdMatrix()
Oops.
1 parent dbe611a commit ef66335

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

L4D2VR/vr.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -720,7 +720,7 @@ void VR::ProcessInput()
720720
}
721721
}
722722

723-
VMatrix VR::VMatrixToHmdMatrix(const vr::HmdMatrix34_t &hmdMat)
723+
VMatrix VR::VMatrixFromHmdMatrix(const vr::HmdMatrix34_t &hmdMat)
724724
{
725725
// VMatrix has a different implicit coordinate system than HmdMatrix34_t, but this function does not convert between them
726726
VMatrix vMat(
@@ -733,7 +733,7 @@ VMatrix VR::VMatrixToHmdMatrix(const vr::HmdMatrix34_t &hmdMat)
733733
return vMat;
734734
}
735735

736-
vr::HmdMatrix34_t VR::VMatrixFromHmdMatrix(const VMatrix &vMat)
736+
vr::HmdMatrix34_t VR::VMatrixToHmdMatrix(const VMatrix &vMat)
737737
{
738738
vr::HmdMatrix34_t hmdMat = {0};
739739

@@ -808,8 +808,8 @@ bool VR::CheckOverlayIntersectionForController(vr::VROverlayHandle_t overlayHand
808808
if (!controllerPose.bPoseIsValid)
809809
return false;
810810

811-
VMatrix controllerVMatrix = VMatrixToHmdMatrix(controllerPose.mDeviceToAbsoluteTracking);
812-
VMatrix tipVMatrix = VMatrixToHmdMatrix(GetControllerTipMatrix(controllerRole));
811+
VMatrix controllerVMatrix = VMatrixFromHmdMatrix(controllerPose.mDeviceToAbsoluteTracking);
812+
VMatrix tipVMatrix = VMatrixFromHmdMatrix(GetControllerTipMatrix(controllerRole));
813813
tipVMatrix.MatrixMul(controllerVMatrix, controllerVMatrix);
814814

815815
vr::VROverlayIntersectionParams_t params = {0};

L4D2VR/vr.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,8 @@ class VR
196196
void GetViewParameters();
197197
void ProcessMenuInput();
198198
void ProcessInput();
199-
VMatrix VMatrixToHmdMatrix(const vr::HmdMatrix34_t &hmdMat);
200-
vr::HmdMatrix34_t VMatrixFromHmdMatrix(const VMatrix &vMat);
199+
VMatrix VMatrixFromHmdMatrix(const vr::HmdMatrix34_t &hmdMat);
200+
vr::HmdMatrix34_t VMatrixToHmdMatrix(const VMatrix &vMat);
201201
vr::HmdMatrix34_t GetControllerTipMatrix(vr::ETrackedControllerRole controllerRole);
202202
bool CheckOverlayIntersectionForController(vr::VROverlayHandle_t overlayHandle, vr::ETrackedControllerRole controllerRole);
203203
QAngle GetRightControllerAbsAngle();

0 commit comments

Comments
 (0)