teambeef/jkxr
0
0
Fork 0
mirror of https://github.com/DrBeef/JKXR.git synced 2025-02-21 11:20:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Scope Zooming (in and out) (@MuadDib)

Browse source
This commit is contained in:
Simon 2023-01-19 21:16:20 +00:00
parent dad5ed29f7
commit 7578e39d67
3 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Projects/Android/jni/JKVR/VrClientInfo.h
View file

@ -23,6 +23,7 @@ typedef struct {
int move_speed; // 0 (default) = Comfortable (75%) , 1 = Full (100%), 2 = Walk (50%) int move_speed; // 0 (default) = Comfortable (75%) , 1 = Full (100%), 2 = Walk (50%)
bool crouched; bool crouched;
int cgzoommode; int cgzoommode;
int cgzoomdir;
int saberBlockDebounce; // Amount of time after player is blocked that the saber position is fixed int saberBlockDebounce; // Amount of time after player is blocked that the saber position is fixed
int forceid; int forceid;

10
Projects/Android/jni/JKVR/VrInputDefault.cpp
View file

@ -248,7 +248,15 @@ void HandleInput_Default( ovrInputStateTrackedRemote *pDominantTrackedRemoteNew,
if (between(-0.2f, primaryJoystickX, 0.2f)) { if (between(-0.2f, primaryJoystickX, 0.2f)) {
if (cl.frame.ps.weapon == WP_DISRUPTOR) if (cl.frame.ps.weapon == WP_DISRUPTOR)
{ {
sendButtonAction("+altattack", pPrimaryJoystick->y > 0.8f); if (pPrimaryJoystick->y > 0.8f) {
vr.cgzoomdir = -1; // zooming in
sendButtonAction("+altattack", true);
} else if (pPrimaryJoystick->y < -0.8f) {
vr.cgzoomdir = 1; // zooming out
sendButtonAction("+altattack", true);
} else {
sendButtonAction("+altattack", false);
}
} }
else else
{ {

4
Projects/Android/jni/OpenJK/codeJK2/cgame/cg_view.cpp
View file

@ -1423,8 +1423,8 @@ static qboolean CG_CalcFov( void ) {
} }
else else
{ {
// disruptor zooming in faster // disruptor zooming in faster (and also either in or out)
cg_zoomFov -= cg.frametime * 0.075f; cg_zoomFov += vr->cgzoomdir * cg.frametime * 0.075f;
} }
// Clamp zoomFov // Clamp zoomFov