teambeef/ioq3quest
0
0
Fork 0
mirror of https://github.com/DrBeef/ioq3quest.git synced 2024-11-22 03:51:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make OpenXR build behave the same like VrAPI build

Browse source
This commit is contained in:
Lubos 2022-07-05 16:28:08 +02:00
parent b11fc0fb29
commit b43a9a67c7
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
android/app/src/main/cpp/code/vr/vr_renderer.c
View file

@ -23,7 +23,8 @@ extern vr_clientinfo_t vr;
extern cvar_t *vr_heightAdjust; extern cvar_t *vr_heightAdjust;
XrView* projections; XrView* projections;
GLboolean stageSupported = GL_FALSE; qboolean needRecenter = qtrue;
qboolean stageSupported = qfalse;
void VR_UpdateStageBounds(ovrApp* pappState) { void VR_UpdateStageBounds(ovrApp* pappState) {
XrExtent2Df stageBounds = {}; XrExtent2Df stageBounds = {};
@ -278,7 +279,7 @@ void VR_InitRenderer( engine_t* engine ) {
for (uint32_t i = 0; i < numOutputSpaces; i++) { for (uint32_t i = 0; i < numOutputSpaces; i++) {
if (referenceSpaces[i] == XR_REFERENCE_SPACE_TYPE_STAGE) { if (referenceSpaces[i] == XR_REFERENCE_SPACE_TYPE_STAGE) {
stageSupported = GL_TRUE; stageSupported = qtrue;
break; break;
} }
} }
@ -505,13 +506,13 @@ void VR_DrawFrame( engine_t* engine ) {
cylinder_layer.subImage.imageArrayIndex = 0; cylinder_layer.subImage.imageArrayIndex = 0;
const XrVector3f axis = {0.0f, 1.0f, 0.0f}; const XrVector3f axis = {0.0f, 1.0f, 0.0f};
XrVector3f pos = { XrVector3f pos = {
invViewTransform[0].position.x - sin(radians(vr.menuYaw)) * 4.0f, invViewTransform[0].position.x - sin(radians(vr.menuYaw)) * 6.0f,
-0.25f, invViewTransform[0].position.y,
invViewTransform[0].position.z - cos(radians(vr.menuYaw)) * 4.0f invViewTransform[0].position.z - cos(radians(vr.menuYaw)) * 6.0f
}; };
cylinder_layer.pose.orientation = XrQuaternionf_CreateFromVectorAngle(axis, radians(vr.menuYaw)); cylinder_layer.pose.orientation = XrQuaternionf_CreateFromVectorAngle(axis, radians(vr.menuYaw));
cylinder_layer.pose.position = pos; cylinder_layer.pose.position = pos;
cylinder_layer.radius = 12.0f; cylinder_layer.radius = 8.0f;
cylinder_layer.centralAngle = MATH_PI * 0.5f; cylinder_layer.centralAngle = MATH_PI * 0.5f;
cylinder_layer.aspectRatio = width / (float)height / 0.75f; cylinder_layer.aspectRatio = width / (float)height / 0.75f;
@ -534,4 +535,10 @@ void VR_DrawFrame( engine_t* engine ) {
OXR(xrEndFrame(engine->appState.Session, &endFrameInfo)); OXR(xrEndFrame(engine->appState.Session, &endFrameInfo));
frameBuffer->TextureSwapChainIndex++; frameBuffer->TextureSwapChainIndex++;
frameBuffer->TextureSwapChainIndex %= frameBuffer->TextureSwapChainLength; frameBuffer->TextureSwapChainIndex %= frameBuffer->TextureSwapChainLength;
if (needRecenter)
{
VR_Recenter(engine);
needRecenter = qfalse;
}
} }