teambeef
/
quake2quest
mirror of https://github.com/DrBeef/Quake2Quest.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed for Quest 2 

- proper FOV
- 90 hz support
This commit is contained in:
Simon 2020-10-14 22:21:06 +01:00
parent ec004c058a
commit 058d7ccac9
24 changed files with 166 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -46,3 +46,6 @@ Projects/Android/.gradle/4.6/fileHashes/fileHashes.lock
Projects/Android/.gradle/vcsWorkingDirs/gc.properties
drbeef-release-key.keystore
assets/pak6.pak
Projects/Android/Android.iml
Projects/Projects.iml
VrSamples-Quake2Quest.iml

179
Projects/Android/Android.iml
View File

@ -1,14 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id=":VrSamples:Quake2Quest:Projects:Android" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
<module external.linked.project.id=":VrSamples:Quake2Quest:Projects:Android" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="Quake2Quest.VrSamples.Quake2Quest.Projects" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
<option name="GRADLE_PROJECT_PATH" value=":VrSamples:Quake2Quest:Projects:Android" />
<option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.2.0" />
<option name="LAST_KNOWN_AGP_VERSION" value="3.2.0" />
</configuration>
</facet>
<facet type="native-android-gradle" name="Native-Android-Gradle">
<configuration>
<option name="SELECTED_BUILD_VARIANT" value="debug" />
<option name="SELECTED_BUILD_VARIANT" value="debug-armeabi-v7a" />
</configuration>
</facet>
<facet type="android" name="Android">
@ -21,38 +23,117 @@
</afterSyncTasks>
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="RES_FOLDER_RELATIVE_PATH" value="/../../res" />
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../res" />
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../res;file://$MODULE_DIR$/src/debug/res;file://$MODULE_DIR$/build/generated/res/rs/debug;file://$MODULE_DIR$/build/generated/res/resValues/debug" />
<option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/androidTest/res;file://$MODULE_DIR$/src/test/res;file://$MODULE_DIR$/src/androidTestDebug/res;file://$MODULE_DIR$/src/testDebug/res;file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug;file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" />
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/../../assets" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
<output url="file://$MODULE_DIR$/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
<output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/jni/src/android" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/src/client" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/src/game" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/src/linux" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/src/null" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/src/qcommon" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/src/ref_gl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/src/server" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/SDL2/SDL2/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/SDL2/SDL2/src/atomic" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/SDL2/SDL2/src/audio" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/SDL2/SDL2/src/audio/android" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/SDL2/SDL2/src/audio/dummy" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/SDL2/SDL2/src/compat" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/SDL2/SDL2/src/core/android" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/SDL2/SDL2/src/cpuinfo" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/SDL2/SDL2/src/dynapi" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/SDL2/SDL2/src/events" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/SDL2/SDL2/src/file" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/SDL2/SDL2/src/filesystem/android" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/SDL2/SDL2/src/haptic" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/SDL2/SDL2/src/haptic/dummy" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/SDL2/SDL2/src/joystick" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/SDL2/SDL2/src/joystick/android" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/SDL2/SDL2/src/loadso/dlopen" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/SDL2/SDL2/src/main/android" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/SDL2/SDL2/src/power" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/SDL2/SDL2/src/power/android" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/SDL2/SDL2/src/render" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/SDL2/SDL2/src/render/direct3d" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/SDL2/SDL2/src/render/direct3d11" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/SDL2/SDL2/src/render/opengl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/SDL2/SDL2/src/render/opengles" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/SDL2/SDL2/src/render/opengles2" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/SDL2/SDL2/src/render/psp" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/SDL2/SDL2/src/render/software" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/SDL2/SDL2/src/stdlib" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/SDL2/SDL2/src/test" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/SDL2/SDL2/src/thread" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/SDL2/SDL2/src/thread/pthread" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/SDL2/SDL2/src/timer" 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/android" 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/SDL2_mixer" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/SDL2/SDL2_mixer/timidity" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/SupportLibs/gl4es/src/gl" 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/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/Quake2VR" 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/client" 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/sound" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/client/vid" 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/game" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/game/monster/berserker" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/game/monster/boss2" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/game/monster/boss3" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/game/monster/brain" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/game/monster/chick" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/game/monster/flipper" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/game/monster/float" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/game/monster/flyer" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/game/monster/gladiator" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/game/monster/gunner" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/game/monster/hover" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/game/monster/infantry" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/game/monster/insane" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/game/monster/medic" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/game/monster/misc" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/game/monster/mutant" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/game/monster/parasite" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/game/monster/soldier" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/quake2/src/game/monster/supertank" 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/savegame" isTestSource="false" />
<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/r/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/rs/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" 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/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/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/res/rs/androidTest/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
<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/resValues/androidTest/debug" type="java-test-resource" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
@ -83,14 +164,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@ -99,38 +172,18 @@
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/jni" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/.cxx" />
<excludeFolder url="file://$MODULE_DIR$/.externalNativeBuild" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-apk" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-main-apk-res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifest-checker" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndkBuild" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
<excludeFolder url="file://$MODULE_DIR$/build" />
</content>
<content url="file://$MODULE_DIR$/../../assets">
<sourceFolder url="file://$MODULE_DIR$/../../assets" type="java-resource" />
@ -143,9 +196,9 @@
</content>
<orderEntry type="jdk" jdkName="Android API 24 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Gradle: com.android.support:support-compat-24.2.0" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-annotations:24.2.0@jar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-core-utils-24.2.0" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-core-utils:24.2.0@aar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-compat:24.2.0@aar" level="project" />
<orderEntry type="library" name="Gradle: android-android-24" level="project" />
</component>
</module>

4
Projects/Android/AndroidManifest.xml
View File

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

16
Projects/Android/jni/Quake2VR/Q2VR_SurfaceView.c
View File

@ -1316,10 +1316,11 @@ long shutdownCountdown;
int m_width;
int m_height;
static ovrJava java;
qboolean R_SetMode( void );
void Android_GetScreenRes(int *width, int *height)
void Quest_GetScreenRes(int *width, int *height)
{
if (useScreenLayer())
{
@ -1331,7 +1332,17 @@ void Android_GetScreenRes(int *width, int *height)
}
}
void Android_MessageBox(const char *title, const char *text)
int Quest_GetRefresh()
{
return vrapi_GetSystemPropertyInt( &java, VRAPI_SYS_PROP_DISPLAY_REFRESH_RATE );
}
float getFOV()
{
return vrapi_GetSystemPropertyFloat( &java, VRAPI_SYS_PROP_SUGGESTED_EYE_FOV_DEGREES_X );
}
void Quest_MessageBox(const char *title, const char *text)
{
ALOGE("%s %s", title, text);
}
@ -1382,7 +1393,6 @@ void * AppThreadFunction( void * parm )
{
ovrAppThread * appThread = (ovrAppThread *)parm;
ovrJava java;
java.Vm = appThread->JavaVm;
(*java.Vm)->AttachCurrentThread( java.Vm, &java.Env, NULL );
java.ActivityObject = appThread->ActivityObject;

21
Projects/Android/jni/Quake2VR/VrInputDefault.c
View File

@ -38,19 +38,6 @@ void HandleInput_Default( ovrInputStateTrackedRemote *pDominantTrackedRemoteNew,
static float dominantGripPushTime = 0.0f;
static qboolean inventoryManagementMode = false;
//Show screen view (if in multiplayer toggle scoreboard)
if (((pOffTrackedRemoteNew->Buttons & offButton2) !=
(pOffTrackedRemoteOld->Buttons & offButton2)) &&
(pOffTrackedRemoteNew->Buttons & offButton2)) {
showingScreenLayer = !showingScreenLayer;
//Check we are in multiplayer
if (isMultiplayer()) {
sendButtonActionSimple("score");
}
}
//Menu button
handleTrackedControllerButton(&leftTrackedRemoteState_new, &leftTrackedRemoteState_old, ovrButton_Enter, K_ESCAPE);
@ -133,11 +120,11 @@ void HandleInput_Default( ovrInputStateTrackedRemote *pDominantTrackedRemoteNew,
}
}
if ((pDominantTrackedRemoteNew->Buttons & ovrButton_GripTrigger) !=
(pDominantTrackedRemoteOld->Buttons & ovrButton_GripTrigger)) {
if ((pOffTrackedRemoteNew->Buttons & offButton2) !=
(pOffTrackedRemoteOld->Buttons & offButton2))
{
sendButtonActionSimple("inven");
inventoryManagementMode = (pDominantTrackedRemoteNew->Buttons & ovrButton_GripTrigger) > 0;
inventoryManagementMode = (pOffTrackedRemoteNew->Buttons & offButton2) > 0;
}
}

2
Projects/Android/jni/SupportLibs/gl4es/src/gl/array.c
View File

@ -446,7 +446,7 @@ GLvoid *copy_gl_pointer_color_bgra(const void *ptr, GLint stride, GLsizei width,
#ifdef __ARM_NEON__
int lsrc = *(int*)src;
lsrc = (lsrc&0xff00ff00) | ((lsrc&0x00ff0000)>>16) | ((lsrc&0x000000ff)<<16);
asm volatile (
__asm volatile (
"vmov s12, %1 \n\t" // because you cannot vmovl.u8 d6, s11
"vmovl.u8 q3, d6 \n\t" // Expand to 16-bit (so unsetuped s13 is expanded in d7)
"vmovl.u16 q3, d6 \n\t" // Expand to 32-bit, ignoring expanded d7

16
Projects/Android/jni/SupportLibs/gl4es/src/gl/matvec.c
View File

@ -9,7 +9,7 @@ float FASTMATH dot(const float *a, const float *b) {
float FASTMATH dot4(const float *a, const float *b) {
#ifdef __ARM_NEON__
register float ret;
asm volatile (
__asm volatile (
"vld1.f32 {d0-d1}, [%1] \n" //q0 = a(0..3)
"vld1.f32 {d2-d3}, [%2] \n" //q1 = b(0..3)
"vmul.f32 q0, q0, q1 \n" //q0 = a(0)*b(0),a(1)*b(1),a(2)*b(2),a(3)*b(3)
@ -35,7 +35,7 @@ float cross3(const float *a, const float *b, float* c) {
void matrix_vector(const float *a, const float *b, float *c) {
#ifdef __ARM_NEON__
const float* a1 = a+8;
asm volatile (
__asm volatile (
"vld4.f32 {d0,d2,d4,d6}, [%1] \n"
"vld4.f32 {d1,d3,d5,d7}, [%2] \n" // q0-q3 = a(0,4,8,12/1,5,9,13/2,6,10,14/3,7,11,15)
"vld1.f32 {q4}, [%3] \n" // q4 = b
@ -60,7 +60,7 @@ void vector_matrix(const float *a, const float *b, float *c) {
const float* b2=b+4;
const float* b3=b+8;
const float* b4=b+12;
asm volatile (
__asm volatile (
"vld1.f32 {q0}, [%1] \n" // %q0 = a(0..3)
"vld1.f32 {q1}, [%2] \n" // %q1 = b(0..3)
"vmul.f32 q1, q1, d0[0] \n" // %q1 = b(0..3)*a[0]
@ -88,7 +88,7 @@ void vector3_matrix(const float *a, const float *b, float *c) {
const float* b2=b+4;
const float* b3=b+8;
const float* b4=b+12;
asm volatile (
__asm volatile (
//"vld1.f32 {q0}, [%1] \n" // %q0 = a(0..2)
"vld1.32 {d0}, [%1] \n"
"flds s2, [%1, #8] \n"
@ -127,7 +127,7 @@ void vector3_matrix3(const float *a, const float *b, float *c) {
void vector_normalize(float *a) {
#ifdef __ARM_NEON__
asm volatile (
__asm volatile (
"vld1.32 {d4}, [%0] \n\t" //d4={x0,y0}
"flds s10, [%0, #8] \n\t" //d5[0]={z0}
"vsub.f32 s11, s11, s11 \n\t"
@ -162,7 +162,7 @@ void vector_normalize(float *a) {
void vector4_normalize(float *a) {
#ifdef __ARM_NEON__
asm volatile (
__asm volatile (
"vld1.32 {q2}, [%0] \n\t" //q2={x0,y0,z0,00}
"vmul.f32 d0, d4, d4 \n\t" //d0= d4*d4
@ -199,7 +199,7 @@ void FASTMATH matrix_transpose(const float *a, float *b) {
#ifdef __ARM_NEON__
const float* a1 = a+8;
float* b1=b+8;
asm volatile (
__asm volatile (
"vld4.f32 {d0,d2,d4,d6}, [%1] \n"
"vld4.f32 {d1,d3,d5,d7}, [%2] \n" // %q0-%q3 = a(0,4,8,12/1,5,9,13/2,6,10,14/3,7,11,15)
"vst1.f32 {d0-d3}, [%0] \n"
@ -263,7 +263,7 @@ void matrix_mul(const float *a, const float *b, float *c) {
const float* a1 = a+8;
const float* b1=b+8;
float* c1=c+8;
asm volatile (
__asm volatile (
"vld1.32 {d16-d19}, [%2] \n"
"vld1.32 {d20-d23}, [%3] \n"
"vld1.32 {d0-d3}, [%4] \n"

4
Projects/Android/jni/quake2/Android.mk
View File

@ -104,8 +104,8 @@ LOCAL_SRC_FILES := $(CLIENT_OBJS_:.o=.c) \
LOCAL_LDLIBS := -lEGL -ldl -llog -landroid -lOpenSLES -lz
LOCAL_STATIC_LIBRARIES := sigc libzip libpng libjpeg
LOCAL_SHARED_LIBRARIES := gl4es SDL2 SDL2_mixer vrapi
LOCAL_STATIC_LIBRARIES := gl4es sigc libzip libpng libjpeg
LOCAL_SHARED_LIBRARIES := SDL2 SDL2_mixer vrapi
LOCAL_LDLIBS += -lGLESv3
include $(BUILD_SHARED_LIBRARY)

2
Projects/Android/jni/quake2/src/client/cl_main.c
View File

@ -71,7 +71,6 @@ cvar_t *cl_lightlevel;
cvar_t *name;
cvar_t *skin;
cvar_t *rate;
cvar_t *fov;
cvar_t *horplus;
cvar_t *windowed_mouse;
cvar_t *msg;
@ -532,7 +531,6 @@ CL_InitLocal(void)
rate = Cvar_Get("rate", "8000", CVAR_USERINFO | CVAR_ARCHIVE);
msg = Cvar_Get("msg", "1", CVAR_USERINFO | CVAR_ARCHIVE);
hand = Cvar_Get("hand", "0", CVAR_USERINFO | CVAR_ARCHIVE);
fov = Cvar_Get("fov", "104", CVAR_USERINFO | CVAR_ARCHIVE);
horplus = Cvar_Get("horplus", "0", CVAR_ARCHIVE);
windowed_mouse = Cvar_Get("windowed_mouse", "1", CVAR_USERINFO | CVAR_ARCHIVE);
gender = Cvar_Get("gender", "male", CVAR_USERINFO | CVAR_ARCHIVE);

6
Projects/Android/jni/quake2/src/client/menu/videomenu.c
View File

@ -37,7 +37,6 @@ static cvar_t *r_hudscale;
static cvar_t *r_consolescale;
static cvar_t *r_menuscale;
static cvar_t *crosshair_scale;
static cvar_t *fov;
extern cvar_t *scr_viewsize;
extern cvar_t *vid_gamma;
extern cvar_t *vid_fullscreen;
@ -361,11 +360,6 @@ VID_MenuInit(void)
crosshair_scale = Cvar_Get("crosshair_scale", "-1", CVAR_ARCHIVE);
}
if (!fov)
{
fov = Cvar_Get("fov", "104", CVAR_USERINFO | CVAR_ARCHIVE);
}
if (!vid_gamma)
{
vid_gamma = Cvar_Get("vid_gamma", "1.2", CVAR_ARCHIVE);

2
Projects/Android/jni/quake2/src/client/refresh/gl1/gl1_main.c
View File

@ -79,7 +79,6 @@ cvar_t *r_fullbright;
cvar_t *r_novis;
cvar_t *r_lerpmodels;
cvar_t *gl_lefthand;
cvar_t *r_gunfov;
cvar_t *r_farsee;
cvar_t *vr_lasersight;
@ -1221,7 +1220,6 @@ R_Register(void)
vr_lasersight = ri.Cvar_Get("vr_lasersight", "0", CVAR_LATCH);
vr_weaponscale = ri.Cvar_Get("vr_weaponscale", "0.56", CVAR_ARCHIVE);
r_gunfov = ri.Cvar_Get("r_gunfov", "80", CVAR_ARCHIVE);
r_farsee = ri.Cvar_Get("r_farsee", "0", CVAR_LATCH | CVAR_ARCHIVE);
r_norefresh = ri.Cvar_Get("r_norefresh", "0", 0);
r_fullbright = ri.Cvar_Get("r_fullbright", "0", 0);

1
Projects/Android/jni/quake2/src/client/refresh/gl1/header/local.h
View File

@ -166,7 +166,6 @@ extern int r_viewcluster, r_viewcluster2, r_oldviewcluster, r_oldviewcluster2;
extern cvar_t *r_norefresh;
extern cvar_t *gl_lefthand;
extern cvar_t *r_gunfov;
extern cvar_t *r_farsee;
extern cvar_t *r_drawentities;
extern cvar_t *r_drawworld;

2
Projects/Android/jni/quake2/src/client/refresh/gl3/gl3_main.c
View File

@ -97,7 +97,6 @@ cvar_t *gl3_particle_square;
cvar_t *vr_lasersight;
cvar_t *gl_lefthand;
cvar_t *r_gunfov;
cvar_t *r_farsee;
cvar_t *gl3_intensity;
@ -194,7 +193,6 @@ GL3_Register(void)
{
vr_lasersight = ri.Cvar_Get("vr_lasersight", "0", CVAR_LATCH);
gl_lefthand = ri.Cvar_Get("hand", "0", CVAR_USERINFO | CVAR_ARCHIVE);
r_gunfov = ri.Cvar_Get("r_gunfov", "104", CVAR_ARCHIVE);
r_farsee = ri.Cvar_Get("r_farsee", "0", CVAR_LATCH | CVAR_ARCHIVE);
gl_drawbuffer = ri.Cvar_Get("gl_drawbuffer", "GL_BACK", 0);

1
Projects/Android/jni/quake2/src/client/refresh/gl3/header/local.h
View File

@ -507,7 +507,6 @@ extern cvar_t *r_fullbright;
extern cvar_t *r_norefresh;
extern cvar_t *gl_lefthand;
extern cvar_t *r_gunfov;
extern cvar_t *r_farsee;
extern cvar_t *r_drawworld;

1
Projects/Android/jni/quake2/src/client/refresh/soft/sw_main.c
View File

@ -235,7 +235,6 @@ R_RegisterVariables (void)
r_mode = ri.Cvar_Get( "r_mode", "0", CVAR_ARCHIVE );
r_lefthand = ri.Cvar_Get( "hand", "0", CVAR_USERINFO | CVAR_ARCHIVE );
r_gunfov = ri.Cvar_Get( "r_gunfov", "104", CVAR_ARCHIVE );
r_speeds = ri.Cvar_Get ("r_speeds", "0", 0);
r_fullbright = ri.Cvar_Get ("r_fullbright", "0", 0);
r_drawentities = ri.Cvar_Get ("r_drawentities", "1", 0);

7
Projects/Android/jni/quake2/src/client/vid/glimp_android.c
View File

@ -43,7 +43,8 @@ cvar_t *m_up;
cvar_t *m_yaw;
cvar_t *sensitivity;
void Android_GetScreenRes(int *width, int *height);
void Quest_GetScreenRes(int *width, int *height);
int Quest_GetRefresh();
qboolean GLimp_Init(void) { return true; }
void GLimp_Shutdown(void) {}
@ -60,10 +61,10 @@ qboolean GLimp_InitGraphics(int fullscreen, int *pwidth, int *pheight)
}
void GLimp_ShutdownGraphics(void) {}
void GLimp_GrabInput(qboolean grab) {}
int GLimp_GetRefreshRate(void) { return 72; } // Returen Quest refresh rate
int GLimp_GetRefreshRate(void) { return Quest_GetRefresh(); } // Returen Quest refresh rate
qboolean GLimp_GetDesktopMode(int *pwidth, int *pheight)
{
Android_GetScreenRes(pwidth, pheight);
Quest_GetScreenRes(pwidth, pheight);
return 1; //bettter
}

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

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

1
Projects/Android/jni/quake2/src/common/header/shared.h
View File

@ -234,6 +234,7 @@ void RotatePointAroundVector(vec3_t dst,
void Android_Vibrate( float duration, int channel, float intensity );
void getVROrigins(vec3_t weaponoffset, vec3_t weaponangles, vec3_t hmdPosition);
float getFOV();
/* ============================================= */

1
Projects/Android/jni/quake2/src/game/header/game.h
View File

@ -174,6 +174,7 @@ typedef struct
//VR Stuff
void (*HapticVibrate)( float duration, int channel, float intensity );
void (*getVROrigins)(vec3_t weaponoffset, vec3_t weaponangles, vec3_t hmdPosition);
float (*getFOV)( );
/* ClientCommand and ServerCommand parameter access */
int (*argc)(void);

22
Projects/Android/jni/quake2/src/game/player/client.c
View File

@ -1736,25 +1736,7 @@ PutClientInServer(edict_t *ent)
client->ps.pmove.origin[1] = spawn_origin[1] * 8;
client->ps.pmove.origin[2] = spawn_origin[2] * 8;
/* if (deathmatch->value && ((int)dmflags->value & DF_FIXED_FOV))
{
client->ps.fov = 104;
}
else
{
client->ps.fov = (int)strtol(Info_ValueForKey(client->pers.userinfo, "fov"), (char **)NULL, 10);
if (client->ps.fov < 1)
{
client->ps.fov = 104;
}
else if (client->ps.fov > 160)
{
client->ps.fov = 160;
}
}*/
client->ps.fov = 104;
client->ps.fov = gi.getFOV();
client->ps.gunindex = gi.modelindex(client->pers.weapon->view_model);
@ -1991,7 +1973,7 @@ ClientUserinfoChanged(edict_t *ent, char *userinfo)
ent->client->ps.fov = 160;
}
}*/
ent->client->ps.fov = 104;
ent->client->ps.fov = gi.getFOV();
/* handedness */
s = Info_ValueForKey(userinfo, "hand");

2
Projects/Android/jni/quake2/src/game/player/view.c
View File

@ -1128,7 +1128,7 @@ ClientEndServerFrame(edict_t *ent)
if (level.intermissiontime)
{
current_client->ps.blend[3] = 0;
current_client->ps.fov = 104;
current_client->ps.fov = gi.getFOV();
G_SetStats(ent);
return;
}

1
Projects/Android/jni/quake2/src/server/sv_game.c
View File

@ -432,6 +432,7 @@ SV_InitGameProgs(void)
import.HapticVibrate = Android_Vibrate;
import.getVROrigins = getVROrigins;
import.getFOV = getFOV;
import.argc = Cmd_Argc;
import.argv = Cmd_Argv;

4
Projects/Projects.iml
View File

@ -1,9 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id=":VrSamples:Quake2Quest:Projects" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/Android" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
<module external.linked.project.id=":VrSamples:Quake2Quest:Projects" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/Android" external.system.id="GRADLE" external.system.module.group="Quake2Quest.VrSamples.Quake2Quest" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
<option name="GRADLE_PROJECT_PATH" value=":VrSamples:Quake2Quest:Projects" />
<option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" />
<option name="LAST_KNOWN_AGP_VERSION" />
</configuration>
</facet>
<facet type="java-gradle" name="Java-Gradle">

4
VrSamples-Quake2Quest.iml
View File

@ -1,9 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id=":VrSamples:Quake2Quest" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/Projects/Android" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
<module external.linked.project.id=":VrSamples:Quake2Quest" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/Projects/Android" external.system.id="GRADLE" external.system.module.group="Quake2Quest.VrSamples" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
<option name="GRADLE_PROJECT_PATH" value=":VrSamples:Quake2Quest" />
<option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" />
<option name="LAST_KNOWN_AGP_VERSION" />
</configuration>
</facet>
<facet type="java-gradle" name="Java-Gradle">