archive/CitraVR
1
0
Fork 0
mirror of https://github.com/amwatson/CitraVR.git synced 2024-09-20 03:11:40 +02:00
Code Issues Projects Releases Packages Wiki Activity

[vr_main] remove explicit 'hand' vector variables and do vector subtraction instead

Browse source
This commit is contained in:
amwatson 2024-02-15 21:38:56 -06:00
parent 8340e84691
commit fe37e902d1
1 changed files with 7 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/android/app/src/main/jni/vr/vr_main.cpp
View file

@ -389,31 +389,13 @@ private:
: immersiveScaleFactor[2];
{
const XrVector3f leftVec = {
gOpenXr->headLocation.pose.position.x -
mInputStateFrame.mHandPositions[InputStateFrame::LEFT_CONTROLLER]
.pose.position.x,
gOpenXr->headLocation.pose.position.y -
mInputStateFrame.mHandPositions[InputStateFrame::LEFT_CONTROLLER]
.pose.position.y,
gOpenXr->headLocation.pose.position.z -
mInputStateFrame.mHandPositions[InputStateFrame::LEFT_CONTROLLER]
.pose.position.z,
};
const float lengthLeft = XrMath::Vector3f::Length(leftVec);
const XrVector3f rightVec = {
gOpenXr->headLocation.pose.position.x -
mInputStateFrame.mHandPositions[InputStateFrame::RIGHT_CONTROLLER]
.pose.position.x,
gOpenXr->headLocation.pose.position.y -
mInputStateFrame.mHandPositions[InputStateFrame::RIGHT_CONTROLLER]
.pose.position.y,
gOpenXr->headLocation.pose.position.z -
mInputStateFrame.mHandPositions[InputStateFrame::RIGHT_CONTROLLER]
.pose.position.z,
};
const float lengthRight = XrMath::Vector3f::Length(rightVec);
const float length = std::min(lengthLeft, lengthRight);
const float lengthLeft = XrMath::Vector3f::Length(
gOpenXr->headLocation.pose.position -
mInputStateFrame.mHandPositions[InputStateFrame::LEFT_CONTROLLER].pose.position);
const float lengthRight = XrMath::Vector3f::Length(
gOpenXr->headLocation.pose.position -
mInputStateFrame.mHandPositions[InputStateFrame::RIGHT_CONTROLLER].pose.position);
const float length = std::min(lengthLeft, lengthRight);
// This block is for testing which uinform offset is needed
// for a given game to implement new super-immersive profiles if needed