Skip to content

Commit 35163ee

Browse files
committed
Updated for FOV issues
1 parent 299ceb4 commit 35163ee

File tree

6 files changed

+13
-9
lines changed

6 files changed

+13
-9
lines changed

Projects/Android/AndroidManifest.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="com.drbeef.questzdoom"
4-
android:versionCode="21"
5-
android:versionName="1.1.3" android:installLocation="auto" >
4+
android:versionCode="22"
5+
android:versionName="1.1.4" android:installLocation="auto" >
66

77
<!-- Tell the system this app requires OpenGL ES 3.1. -->
88
<uses-feature android:glEsVersion="0x00030001" android:required="true"/>

Projects/Android/jni/QzDoom/QzDoom_SurfaceView.c

+1-4
Original file line numberDiff line numberDiff line change
@@ -1310,10 +1310,7 @@ static bool destroyed = false;
13101310

13111311
float QzDoom_GetFOV()
13121312
{
1313-
if (vrFOV == 0.0f) {
1314-
vrFOV = vrapi_GetSystemPropertyInt(&gAppState.Java, VRAPI_SYS_PROP_SUGGESTED_EYE_FOV_DEGREES_X);
1315-
}
1316-
1313+
vrFOV = vrapi_GetSystemPropertyInt(&gAppState.Java, VRAPI_SYS_PROP_SUGGESTED_EYE_FOV_DEGREES_Y);
13171314
return vrFOV;
13181315
}
13191316

Projects/Android/jni/gzdoom-g3.3mgw_mobile/src/p_user.cpp

+3
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,9 @@ CUSTOM_CVAR(Float, cl_predict_lerpthreshold, 2.00f, CVAR_ARCHIVE | CVAR_GLOBALCO
125125
ColorSetList ColorSets;
126126
PainFlashList PainFlashes;
127127

128+
// FOV cvar - This is not really used, is only here in case a mod needs to call it
129+
CVAR(Float, fov, 90.f, CVAR_ARCHIVE | CVAR_USERINFO | CVAR_NOINITCALL)
130+
128131
struct PredictPos
129132
{
130133
int gametic;

Projects/Android/jni/gzdoom-g3.3mgw_mobile/src/version.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ const char *GetVersionString();
4141

4242
/** Lots of different version numbers **/
4343

44-
#define VERSIONSTR "DrBeef's QuestZDoom-1.1.3 (LZDoom 3.85)"
44+
#define VERSIONSTR "DrBeef's QuestZDoom-1.1.4 (LZDoom 3.85)"
4545

4646
// The version as seen in the Windows resource
4747
#define RC_FILEVERSION 3,85,0

Projects/Projects.iml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.id=":VrSamples:QuestzDoom:Projects" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/Android" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id=":VrSamples:QuestzDoom:Projects" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/Android" external.system.id="GRADLE" external.system.module.group="QuestzDoom.VrSamples.QuestzDoom" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
66
<option name="GRADLE_PROJECT_PATH" value=":VrSamples:QuestzDoom:Projects" />
7+
<option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" />
8+
<option name="LAST_KNOWN_AGP_VERSION" />
79
</configuration>
810
</facet>
911
<facet type="java-gradle" name="Java-Gradle">

VrSamples-QuestzDoom.iml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.id=":VrSamples:QuestzDoom" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/Projects/Android" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id=":VrSamples:QuestzDoom" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/Projects/Android" external.system.id="GRADLE" external.system.module.group="QuestzDoom.VrSamples" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
66
<option name="GRADLE_PROJECT_PATH" value=":VrSamples:QuestzDoom" />
7+
<option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" />
8+
<option name="LAST_KNOWN_AGP_VERSION" />
79
</configuration>
810
</facet>
911
<facet type="java-gradle" name="Java-Gradle">

0 commit comments

Comments
 (0)