teambeef/quake2quest
0
0
Fork 0
mirror of https://github.com/DrBeef/Quake2Quest.git synced 2025-03-01 14:40:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Updated for FOV issue

Browse source
This commit is contained in:
Simon 2020-10-18 22:38:50 +01:00
parent 058d7ccac9
commit f8d2e095a8
5 changed files with 17 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Projects/Android/Android.iml
View file

@ -70,6 +70,10 @@
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/SDL2/SDL2/src/timer/unix" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/SDL2/SDL2/src/timer/unix" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/SDL2/SDL2/src/video" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/SDL2/SDL2/src/video" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/SDL2/SDL2/src/video/android" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/SDL2/SDL2/src/video/android" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/libpng/arm" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/libpng" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/sigc++" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/sigc++/functors" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/SDL2/libogg-1.3.1/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/SDL2/libogg-1.3.1/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/SDL2/libvorbisidec-1.2.1" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/SDL2/libvorbisidec-1.2.1" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/SDL2/SDL2_mixer" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/SDL2/SDL2_mixer" isTestSource="false" />
@ -78,25 +82,19 @@
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/gl4es/src/gl/math" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/gl4es/src/gl/math" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/gl4es/src/gl/wrap" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/gl4es/src/gl/wrap" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/gl4es/src/glx" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/gl4es/src/glx" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/libpng/arm" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/libpng" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/libzip" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/sigc++" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/sigc++/functors" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/backends/unix/shared" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/client/refresh/files" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/client/refresh/gl1" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/common" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/common/shared" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/jpeg8d" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/jpeg8d" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/libzip" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/Quake2VR" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/jni/Quake2VR" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/backends/generic" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/backends/generic" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/backends/unix" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/backends/unix" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/backends/unix/shared" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/client" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/client" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/client/curl" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/client/curl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/client/menu" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/client/menu" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/client/sound" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/client/sound" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/client/vid" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/client/vid" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/common" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/common/shared" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/common/unzip" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/common/unzip" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/server" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/server" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/game" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/game" isTestSource="false" />
@ -122,15 +120,17 @@
<sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/game/monster/tank" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/game/monster/tank" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/game/player" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/game/player" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/game/savegame" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/game/savegame" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/client/refresh/files" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/client/refresh/gl1" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />

4
Projects/Android/AndroidManifest.xml
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.drbeef.quake2quest" package="com.drbeef.quake2quest"
android:versionCode="14" android:versionCode="15"
android:versionName="1.0.3" android:installLocation="auto" > android:versionName="1.0.4" android:installLocation="auto" >
<!-- Tell the system this app requires OpenGL ES 3.1. --> <!-- Tell the system this app requires OpenGL ES 3.1. -->
<uses-feature android:glEsVersion="0x00030001" android:required="true"/> <uses-feature android:glEsVersion="0x00030001" android:required="true"/>

2
Projects/Android/jni/Quake2VR/Q2VR_SurfaceView.c
View file

@ -1339,7 +1339,7 @@ int Quest_GetRefresh()
float getFOV() float getFOV()
{ {
return vrapi_GetSystemPropertyFloat( &java, VRAPI_SYS_PROP_SUGGESTED_EYE_FOV_DEGREES_X ); return vrapi_GetSystemPropertyFloat( &java, VRAPI_SYS_PROP_SUGGESTED_EYE_FOV_DEGREES_Y );
} }
void Quest_MessageBox(const char *title, const char *text) void Quest_MessageBox(const char *title, const char *text)

16
Projects/Android/jni/quake2/src/common/frame.c
View file

@ -32,7 +32,6 @@ cvar_t *developer;
cvar_t *modder; cvar_t *modder;
cvar_t *timescale; cvar_t *timescale;
cvar_t *fixedtime; cvar_t *fixedtime;
cvar_t *cl_maxfps;
cvar_t *dedicated; cvar_t *dedicated;
cvar_t *busywait; cvar_t *busywait;
@ -301,8 +300,6 @@ Qcommon_Init(int argc, char **argv)
// cvars // cvars
cl_maxfps = Cvar_Get("cl_maxfps", "72", CVAR_ARCHIVE);
developer = Cvar_Get("developer", "0", 0); developer = Cvar_Get("developer", "0", 0);
fixedtime = Cvar_Get("fixedtime", "0", 0); fixedtime = Cvar_Get("fixedtime", "0", 0);
@ -502,16 +499,6 @@ Qcommon_BeginFrame(int usec)
Cvar_SetValue("vid_maxfps", 999); Cvar_SetValue("vid_maxfps", 999);
} }
if (cl_maxfps->value > 250)
{
Cvar_SetValue("cl_maxfps", 250);
}
else if (cl_maxfps->value < 1)
{
Cvar_SetValue("cl_maxfps", 60);
}
// Save global time for network- und input code. // Save global time for network- und input code.
curtime = Sys_Milliseconds(); curtime = Sys_Milliseconds();
@ -535,7 +522,8 @@ Qcommon_BeginFrame(int usec)
scene may be more complex then the previous one and SDL scene may be more complex then the previous one and SDL
may give us a 1 or 2 frames too low display refresh rate. may give us a 1 or 2 frames too low display refresh rate.
Add a security magin of 5%, e.g. 60fps * 0.95 = 57fps. */ Add a security magin of 5%, e.g. 60fps * 0.95 = 57fps. */
pfps = (cl_maxfps->value > (rfps * 0.95)) ? floor(rfps * 0.95) : cl_maxfps->value; //pfps = (cl_maxfps->value > (rfps * 0.95)) ? floor(rfps * 0.95) : cl_maxfps->value;
pfps = rfps; // Just use exact same as render fps
// Calculate timings. // Calculate timings.

2
Projects/Android/jni/quake2/src/common/header/common.h
View file

@ -32,7 +32,7 @@
#include "shared.h" #include "shared.h"
#include "crc.h" #include "crc.h"
#define Q2QVERSION "1.0.3" #define Q2QVERSION "1.0.4"
#define YQ2VERSION "7.41" #define YQ2VERSION "7.41"
#define BASEDIRNAME "Quake2Quest" #define BASEDIRNAME "Quake2Quest"