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

Properly fix the vr_recoil option 

- Also added in the laser sight mod with permission courtesy of Alexander Kromm (m8f): https://github.com/mmaulwurff/laser-sight
- Slightly modified the laser sight mod to remove the beam option as this doesn't work correctly in VR
This commit is contained in:
Simon 2020-04-09 10:11:32 +01:00
parent 837d3aa54a
commit 6f371800c7
4 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Projects/Android/jni/gzdoom-g3.3mgw_mobile/wadsrc/static/zscript/actors/inventory/weapons.zs
View File

@ -415,20 +415,24 @@ class Weapon : StateProvider
action void A_ZoomFactor(double zoom = 1, int flags = 0)
{
let player = self.player;
if (player != NULL && player.ReadyWeapon != NULL)
{
zoom = 1 / clamp(zoom, 0.1, 50.0);
if (flags & 1)
{ // Make the zoom instant.
player.FOV = player.DesiredFOV * zoom;
}
if (flags & 2)
{ // Disable pitch/yaw scaling.
zoom = -zoom;
}
player.ReadyWeapon.FOVScale = zoom;
}
CVar recoil = CVar.FindCVar('vr_recoil');
if (recoil.GetBool())
{
let player = self.player;
if (player != NULL && player.ReadyWeapon != NULL)
{
zoom = 1 / clamp(zoom, 0.1, 50.0);
if (flags & 1)
{ // Make the zoom instant.
player.FOV = player.DesiredFOV * zoom;
}
if (flags & 2)
{ // Disable pitch/yaw scaling.
zoom = -zoom;
}
player.ReadyWeapon.FOVScale = zoom;
}
}
}
//===========================================================================

BIN
assets/mods/laser-sight-0.5.5-vr.pk3 Normal file
View File

Binary file not shown.

BIN
assets/res/lzdoom.pk3
View File

Binary file not shown.

1
java/com/drbeef/questzdoom/GLES3JNIActivity.java
View File

@ -164,6 +164,7 @@ import android.support.v4.content.ContextCompat;
copy_asset("/sdcard/QuestZDoom", "res/lz_game_support.pk3", true);
copy_asset("/sdcard/QuestZDoom", "res/lights.pk3", true);
copy_asset("/sdcard/QuestZDoom", "res/brightmaps.pk3", true);
copy_asset("/sdcard/QuestZDoom", "mods/laser-sight-0.5.5-vr.pk3", false);
copy_asset("/sdcard/QuestZDoom/audiopack", "snd_fluidsynth/fluidsynth.sf2", false);
//Doom Sharware WAD