teambeef/ioq3quest
0
0
Fork 0
mirror of https://github.com/DrBeef/ioq3quest.git synced 2025-02-21 03:21:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

OpenXR minor fixes

Browse source
This commit is contained in:
Lubos 2022-04-24 20:25:19 +02:00
parent 249847930b
commit 5947168966
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
android/app/src/main/cpp/code/vr/vr_input.c
View file

@ -234,7 +234,6 @@ void QuatToYawPitchRoll(XrQuaternionf q, vec3_t rotation, vec3_t out) {
//0 = left, 1 = right //0 = left, 1 = right
float vibration_channel_duration[2] = {0.0f, 0.0f}; float vibration_channel_duration[2] = {0.0f, 0.0f};
float vibration_channel_intensity[2] = {0.0f, 0.0f}; float vibration_channel_intensity[2] = {0.0f, 0.0f};
//TODO:ovrDeviceID controllerIDs[2];
void VR_Vibrate( int duration, int chan, float intensity ) void VR_Vibrate( int duration, int chan, float intensity )
{ {

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

@ -295,8 +295,6 @@ void VR_DrawFrame( engine_t* engine ) {
30.0f, 30.0f, 0.0f, 0.0f, 1.0f, 0.0f ); 30.0f, 30.0f, 0.0f, 0.0f, 1.0f, 0.0f );
const ovrMatrix4f projectionMatrix = ovrMatrix4f_CreateProjectionFov( const ovrMatrix4f projectionMatrix = ovrMatrix4f_CreateProjectionFov(
vr.fov_x / vr.weapon_zoomLevel, vr.fov_y / vr.weapon_zoomLevel, 0.0f, 0.0f, 1.0f, 0.0f ); vr.fov_x / vr.weapon_zoomLevel, vr.fov_y / vr.weapon_zoomLevel, 0.0f, 0.0f, 1.0f, 0.0f );
re.SetVRHeadsetParms(projectionMatrix.M, monoVRMatrix.M,
engine->appState.Renderer.FrameBuffer.FrameBuffers[engine->appState.Renderer.FrameBuffer.TextureSwapChainIndex]);
GLboolean stageBoundsDirty = GL_TRUE; GLboolean stageBoundsDirty = GL_TRUE;
ovrApp_HandleXrEvents(&engine->appState); ovrApp_HandleXrEvents(&engine->appState);
@ -394,6 +392,8 @@ void VR_DrawFrame( engine_t* engine ) {
ovrFramebuffer* frameBuffer = &engine->appState.Renderer.FrameBuffer; ovrFramebuffer* frameBuffer = &engine->appState.Renderer.FrameBuffer;
ovrFramebuffer_Acquire(frameBuffer); ovrFramebuffer_Acquire(frameBuffer);
ovrFramebuffer_SetCurrent(frameBuffer); ovrFramebuffer_SetCurrent(frameBuffer);
re.SetVRHeadsetParms(projectionMatrix.M, monoVRMatrix.M,
engine->appState.Renderer.FrameBuffer.FrameBuffers[engine->appState.Renderer.FrameBuffer.TextureSwapChainIndex]);
Com_Frame(); Com_Frame();
ovrFramebuffer_Resolve(frameBuffer); ovrFramebuffer_Resolve(frameBuffer);
ovrFramebuffer_Release(frameBuffer); ovrFramebuffer_Release(frameBuffer);

2
android/app/src/main/cpp/code/vr/vr_types.c
View file

@ -287,7 +287,7 @@ void ovrRenderer_Create(
ovrFramebuffer_Create( ovrFramebuffer_Create(
session, session,
&renderer->FrameBuffer, &renderer->FrameBuffer,
GL_SRGB8_ALPHA8, GL_RGBA8,
suggestedEyeTextureWidth, suggestedEyeTextureWidth,
suggestedEyeTextureHeight, suggestedEyeTextureHeight,
NUM_MULTI_SAMPLES); NUM_MULTI_SAMPLES);