teambeef/ioq3quest
0
0
Fork 0
mirror of https://github.com/DrBeef/ioq3quest.git synced 2025-02-16 17:11:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/DrBeef/ioq3quest

Browse source
This commit is contained in:
Simon 2022-04-27 20:40:17 +01:00
commit 3cdf1858a5
4 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
android/app/src/main/cpp/code/vr/vr_base.c
View file

@ -216,6 +216,11 @@ engine_t* VR_GetEngine( void ) {
return &vr_engine; return &vr_engine;
} }
bool VR_isPauseable( void )
{
return (bool)( ( clc.state == CA_ACTIVE) && !Cvar_VariableValue ("cl_paused") );
}
bool VR_useScreenLayer( void ) bool VR_useScreenLayer( void )
{ {
//intermission is never full screen //intermission is never full screen

1
android/app/src/main/cpp/code/vr/vr_base.h
View file

@ -12,6 +12,7 @@ void VR_EnterVR( engine_t* engine, ovrJava java );
void VR_LeaveVR( engine_t* engine ); void VR_LeaveVR( engine_t* engine );
engine_t* VR_GetEngine( void ); engine_t* VR_GetEngine( void );
bool VR_isPauseable( void );
bool VR_useScreenLayer( void ); bool VR_useScreenLayer( void );
float radians(float deg); float radians(float deg);

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

@ -341,6 +341,8 @@ void VR_DrawFrame( engine_t* engine ) {
re.SetVRHeadsetParms(&projectionMatrix, &monoVRMatrix, re.SetVRHeadsetParms(&projectionMatrix, &monoVRMatrix,
engine->framebuffers.framebuffers[engine->framebuffers.swapchainIndex]); engine->framebuffers.framebuffers[engine->framebuffers.swapchainIndex]);
VR_ClearFrameBuffer(engine->framebuffers.framebuffers[engine->framebuffers.swapchainIndex], eyeW, eyeH);
Com_Frame(); Com_Frame();
engine->framebuffers.swapchainIndex = (engine->framebuffers.swapchainIndex + 1) % engine->framebuffers.swapchainIndex = (engine->framebuffers.swapchainIndex + 1) %

2
android/app/src/main/cpp/main.c
View file

@ -89,7 +89,7 @@ int main(int argc, char* argv[]) {
while (1) { while (1) {
if (hasFocus != g_HasFocus) { if (hasFocus != g_HasFocus) {
hasFocus = g_HasFocus; hasFocus = g_HasFocus;
if (!hasFocus && !Cvar_VariableValue ("cl_paused")) { if (!hasFocus && VR_isPauseable()) {
Com_QueueEvent( Sys_Milliseconds(), SE_KEY, K_ESCAPE, qtrue, 0, NULL ); Com_QueueEvent( Sys_Milliseconds(), SE_KEY, K_ESCAPE, qtrue, 0, NULL );
//Com_QueueEvent( Sys_Milliseconds(), SE_KEY, K_CONSOLE, qtrue, 0, NULL ); //Com_QueueEvent( Sys_Milliseconds(), SE_KEY, K_CONSOLE, qtrue, 0, NULL );
paused = true; paused = true;