teambeef/questzdoom
0
0
Fork 0
mirror of https://github.com/DrBeef/QuestZDoom.git synced 2025-04-24 18:22:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix: remove wrong implementation of weapon offset

Browse source 
The implementation is done in the submodule
This commit is contained in:
Emanuele Disco 2023-08-14 02:17:16 +09:00
parent 6bf2c604c3
commit a601c5a4cf
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Projects/Android/jni/QzDoom/VrCommon.h
View file

@ -16,9 +16,6 @@ EXTERN_CVAR(Bool, vr_switch_sticks);
EXTERN_CVAR(Bool, vr_secondary_button_mappings);
EXTERN_CVAR(Bool, vr_two_handed_weapons);
EXTERN_CVAR(Bool, vr_crouch_use_button);
EXTERN_CVAR(Float, vr_weaponOffsetX);
EXTERN_CVAR(Float, vr_weaponOffsetY);
EXTERN_CVAR(Float, vr_weaponOffsetZ);
#include <android/log.h>

12
Projects/Android/jni/QzDoom/VrInputDefault.cpp
View file

@ -144,9 +144,9 @@ void HandleInput_Default( int control_scheme, ovrInputStateTrackedRemote *pDomin
//dominant hand stuff first
{
///Weapon location relative to view
weaponoffset[0] = pDominantTracking->Pose.position.x - hmdPosition[0] - vr_weaponOffsetX;
weaponoffset[1] = pDominantTracking->Pose.position.y - hmdPosition[1] + vr_weaponOffsetY;
weaponoffset[2] = pDominantTracking->Pose.position.z - hmdPosition[2] + vr_weaponOffsetZ;
weaponoffset[0] = pDominantTracking->Pose.position.x - hmdPosition[0];
weaponoffset[1] = pDominantTracking->Pose.position.y - hmdPosition[1];
weaponoffset[2] = pDominantTracking->Pose.position.z - hmdPosition[2];
vec2_t v;
float yawRotation = getViewpointYaw() - hmdorientation[YAW];
@ -180,9 +180,9 @@ void HandleInput_Default( int control_scheme, ovrInputStateTrackedRemote *pDomin
//off-hand stuff
{
offhandoffset[0] = pOffTracking->Pose.position.x - hmdPosition[0] + vr_weaponOffsetX;
offhandoffset[1] = pOffTracking->Pose.position.y - hmdPosition[1] + vr_weaponOffsetY;
offhandoffset[2] = pOffTracking->Pose.position.z - hmdPosition[2] + vr_weaponOffsetZ;
offhandoffset[0] = pOffTracking->Pose.position.x - hmdPosition[0];
offhandoffset[1] = pOffTracking->Pose.position.y - hmdPosition[1];
offhandoffset[2] = pOffTracking->Pose.position.z - hmdPosition[2];
vec2_t v;
float yawRotation = getViewpointYaw() - hmdorientation[YAW];