teambeef/jkxr
0
0
Fork 0
mirror of https://github.com/DrBeef/JKXR.git synced 2024-11-21 19:51:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

For JKA blocks/parries/knockaways reverse the lerp

Browse source 
This makes the saber kick in the right direction
This commit is contained in:
Simon 2023-07-15 20:01:57 +01:00
parent 09cf2d49f3
commit 3fd5e15103
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Projects/Android/jni/JKXR/VrInputDefault.cpp
View file

@ -142,6 +142,7 @@ void HandleInput_Default( ovrInputStateTrackedRemote *pDominantTrackedRemoteNew,
//Somewhere between 1 and 0 //Somewhere between 1 and 0
lerp = 1 - float(cl.serverTime - (vr.saberBlockDebounce - TBDC_SABER_BOUNCETIME / 2)) / float(vr.saberBlockDebounce - (vr.saberBlockDebounce - TBDC_SABER_BOUNCETIME / 2)); lerp = 1 - float(cl.serverTime - (vr.saberBlockDebounce - TBDC_SABER_BOUNCETIME / 2)) / float(vr.saberBlockDebounce - (vr.saberBlockDebounce - TBDC_SABER_BOUNCETIME / 2));
} }
switch(vr.saberBounceMove) { switch(vr.saberBounceMove) {
case LS_B1_BR: case LS_B1_BR:
rotation[PITCH] += lerp * TBDC_SABER_BOUNCEANGLE; rotation[PITCH] += lerp * TBDC_SABER_BOUNCEANGLE;
@ -168,10 +169,17 @@ void HandleInput_Default( ovrInputStateTrackedRemote *pDominantTrackedRemoteNew,
rotation[PITCH] += lerp * TBDC_SABER_BOUNCEANGLE; rotation[PITCH] += lerp * TBDC_SABER_BOUNCEANGLE;
rotation[YAW] += lerp * TBDC_SABER_BOUNCEANGLE; rotation[YAW] += lerp * TBDC_SABER_BOUNCEANGLE;
break; break;
#ifndef JK2_MODE
default:
rotation[PITCH] += lerp * TBDC_SABER_BOUNCEANGLE;
rotation[YAW] += lerp * (TBDC_SABER_BOUNCEANGLE / 2);
break;
#else
default: default:
rotation[PITCH] -= lerp * TBDC_SABER_BOUNCEANGLE; rotation[PITCH] -= lerp * TBDC_SABER_BOUNCEANGLE;
rotation[YAW] += lerp * (TBDC_SABER_BOUNCEANGLE / 2); rotation[YAW] += lerp * (TBDC_SABER_BOUNCEANGLE / 2);
break; break;
#endif
} }
} }