steam-frame/astromaddie--lambda1-vr
1
0 Fork 0
mirror of https://github.com/astromaddie/lambda1-vr.git synced 2026-10-22 07:00:15 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity

Updated to fix FOV issues

Browse Source
This commit is contained in:
Simon committed 2020-10-18 22:19:03 +01:00
1 parent 3cd847191f
commit a8e07c0e2c
8 files changed
+27 -42
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Projects/Android/Android.iml
+13 -13
View File
@@ -47,32 +47,32 @@
<sourceFolder url="file://$MODULE_DIR$/jni/src/gl4es/src/gl/math" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/src/gl4es/src/gl/wrap" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/src/gl4es/src/glx" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/src/Xash3D/xash3d/mainui" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/src/Xash3D/xash3d/mainui/controls" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/src/Xash3D/xash3d/mainui/font" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/src/Xash3D/xash3d/mainui/menus" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/src/Xash3D/xash3d/mainui/menus/dynamic" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/src/Xash3D/xash3d/mainui/utl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/src/hlsdk-xash3d/dlls" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/src/hlsdk-xash3d/pm_shared" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/src/hlsdk-xash3d/cl_dll" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/src/hlsdk-xash3d/cl_dll/hl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/src/hlsdk-xash3d-opfor/pm_shared" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/src/hlsdk-xash3d-opfor/dlls" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/src/hlsdk-xash3d-opfor/dlls/gearbox" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/src/hlsdk-xash3d-opfor/cl_dll" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/src/hlsdk-xash3d-opfor/cl_dll/hl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/src/hlsdk-xash3d-opfor/cl_dll/gearbox" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/src/hlsdk-xash3d/pm_shared" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/src/hlsdk-xash3d/dlls" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/src/hlsdk-xash3d/cl_dll" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/src/hlsdk-xash3d/cl_dll/hl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/src/Xash3D/xash3d/mainui" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/src/Xash3D/xash3d/mainui/controls" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/src/Xash3D/xash3d/mainui/font" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/src/Xash3D/xash3d/mainui/menus" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/src/Xash3D/xash3d/mainui/menus/dynamic" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/jni/src/Xash3D/xash3d/mainui/utl" isTestSource="false" />
<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/rs/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/resValues/debug" type="java-resource" 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/source/apt/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/rs/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/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" />
Projects/Android/AndroidManifest.xml
+2 -2
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.lambda1vr"
android:versionCode="24"
android:versionName="1.4.6" android:installLocation="auto" >
android:versionCode="25"
android:versionName="1.4.7" android:installLocation="auto" >
<!-- Tell the system this app requires OpenGL ES 3.1. -->
<uses-feature android:glEsVersion="0x00030001" android:required="true"/>
Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c
+7 -22
View File
@@ -84,8 +84,6 @@ int GPU_LEVEL = 3;
int NUM_MULTI_SAMPLES = 4;
float SS_MULTIPLIER = 1.25f;
vec2_t cylinderSize = {1280, 720};
float radians(float deg) {
return (deg * M_PI) / 180.0;
}
@@ -718,7 +716,7 @@ void ovrRenderer_Create( int width, int height, ovrRenderer * renderer, const ov
renderer->NumBuffers = VRAPI_FRAME_LAYER_EYE_MAX;
//Now using a symmetrical render target, based on the horizontal FOV
vrFOV = vrapi_GetSystemPropertyInt( java, VRAPI_SYS_PROP_SUGGESTED_EYE_FOV_DEGREES_X);
vrFOV = vrapi_GetSystemPropertyInt( java, VRAPI_SYS_PROP_SUGGESTED_EYE_FOV_DEGREES_Y);
// Create the render Textures.
for ( int eye = 0; eye < VRAPI_FRAME_LAYER_EYE_MAX; eye++ )
@@ -1351,14 +1349,8 @@ void R_ChangeDisplaySettings( int width, int height, qboolean fullscreen );
void Android_GetScreenRes(int *width, int *height)
{
if (useScreenLayer())
{
*width = cylinderSize[0];
*height = cylinderSize[1];
} else {
*width = m_width;
*height = m_height;
}
*width = m_width;
*height = m_height;
}
void Android_MessageBox(const char *title, const char *text)
@@ -1423,8 +1415,8 @@ void VR_Init()
vr_lasersight = Cvar_Get( "vr_lasersight", "0", CVAR_ARCHIVE, "Enables laser-sight" );
char buffer[32];
sprintf(buffer, "%i", (int)vrFOV);
vr_fixed_fov = Cvar_Get( "vr_fixed_fov", buffer, CVAR_ARCHIVE, "FOV for Lambda1VR" );
sprintf(buffer, "%d", (int)vrFOV);
vr_quest_fov = Cvar_Get("vr_quest_fov", buffer, CVAR_LATCH, "FOV for Lambda1VR" );
vr_control_scheme = Cvar_Get( "vr_control_scheme", "0", CVAR_ARCHIVE, "Controller Layout scheme" );
vr_enable_crouching = Cvar_Get( "vr_enable_crouching", "0.85", CVAR_ARCHIVE, "To enable real-world crouching trigger, set this to a value that multiplied by the user's height will trigger crouch mechanic" );
@@ -1580,7 +1572,7 @@ void * AppThreadFunction( void * parm )
// The scene is created here to be able to show a loading icon.
if ( !ovrScene_IsCreated( &appState.Scene ) )
{
ovrScene_Create( cylinderSize[0], cylinderSize[1], &appState.Scene, &java );
ovrScene_Create( m_width, m_height, &appState.Scene, &java );
}
// This is the only place the frame index is incremented, right before
@@ -1728,14 +1720,7 @@ void * AppThreadFunction( void * parm )
if (usingScreenLayer != useScreenLayer())
{
usingScreenLayer = useScreenLayer();
if (usingScreenLayer)
{
R_ChangeDisplaySettings(cylinderSize[0], cylinderSize[1], true);
}
else
{
R_ChangeDisplaySettings(m_width, m_height, false);
}
R_ChangeDisplaySettings(m_width, m_height, false);
}
ovrSubmitFrameDescription2 frameDesc = { 0 };
Projects/Android/jni/src/Lambda1VR/VrCompositor.c
+1 -1
View File
@@ -604,7 +604,7 @@ ovrLayerCylinder2 BuildCylinderLayer( ovrRenderer * cylinderRenderer,
const float density = 4500.0f;
const float rotateYaw = 0.0f;
const float radius = 2.0f;
const ovrVector3f translation = { 0.0f, playerHeight, -0.5f };
const ovrVector3f translation = { 0.0f, playerHeight, -3.5f };
ovrMatrix4f cylinderTransform =
CylinderModelMatrix( textureWidth, textureHeight, translation,
Projects/Android/jni/src/Lambda1VR/VrCvars.h
+1 -1
View File
@@ -11,7 +11,7 @@ convar_t *vr_crowbar_pitchadjust;
convar_t *vr_weapon_recoil;
convar_t *vr_weapon_stabilised;
convar_t *vr_lasersight;
convar_t *vr_fixed_fov;
convar_t *vr_quest_fov;
convar_t *vr_control_scheme;
convar_t *vr_enable_crouching;
convar_t *vr_height_adjust;
Projects/Android/jni/src/Xash3D/xash3d/engine/common/build.c
+1 -1
View File
@@ -139,7 +139,7 @@ Q_buildcommit will identify this build as release or "notset"
*/
const char *Q_buildcommit( void )
{
return "Lambda1VR-v1.4.5";
return "Lambda1VR-v1.4.7";
}
/*
Projects/Android/jni/src/hlsdk-xash3d
+1 -1
Submodule Projects/Android/jni/src/hlsdk-xash3d updated: c85b094853...e0eaec22f1.
Projects/Android/jni/src/hlsdk-xash3d-opfor
+1 -1
Submodule Projects/Android/jni/src/hlsdk-xash3d-opfor updated: 8bc8ad1193...ef32f0c102.