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

Two handed saber improvement

Browse source
This commit is contained in:
Simon 2023-03-21 20:04:54 +00:00
parent 0517b987e2
commit ec021f9b2e
3 changed files with 52 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Projects/Android/AndroidManifest.xml
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.jkxr"
android:versionCode="42"
android:versionName="0.7.2" android:installLocation="auto" >
android:versionCode="44"
android:versionName="0.7.4" android:installLocation="auto" >
<!-- Tell the system this app requires OpenGL ES 3.1. -->
<uses-feature android:glEsVersion="0x00030002" android:required="true"/>

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

@ -437,7 +437,7 @@ void HandleInput_Default( ovrInputStateTrackedRemote *pDominantTrackedRemoteNew,
VectorAdd(offhandPositionAverage, vr.offhandposition[i], offhandPositionAverage);
}
VectorScale(offhandPositionAverage, 0.2f, offhandPositionAverage);
if (vr.weapon_stabilised) {
if (vr.weapon_stabilised && !vr.dualsabers) {
if (vr_virtual_stock->integer == 1 || vr.cgzoommode == 2 || vr.cgzoommode == 4) {
//offset to the appropriate eye a little bit
vec2_t xy = {0, 0};
@ -463,17 +463,22 @@ void HandleInput_Default( ovrInputStateTrackedRemote *pDominantTrackedRemoteNew,
}
else
{
float x =
pOff->Pose.position.x - pWeapon->Pose.position.x;
float y =
pOff->Pose.position.y - pWeapon->Pose.position.y;
float z =
pOff->Pose.position.z - pWeapon->Pose.position.z;
float zxDist = length(x, z);
vec3_t delta;
delta[0] = pOff->Pose.position.x - pWeapon->Pose.position.x;
delta[1] = pOff->Pose.position.y - pWeapon->Pose.position.y;
delta[2] = pOff->Pose.position.z - pWeapon->Pose.position.z;
if (zxDist != 0.0f && z != 0.0f) {
VectorSet(vr.weaponangles[ANGLES_ADJUSTED], -RAD2DEG(atanf(y / zxDist)),
-RAD2DEG(atan2f(x, -z)), vr.weaponangles[ANGLES_ADJUSTED][ROLL] /
int anglesToSet = ANGLES_ADJUSTED;
if (cl.frame.ps.weapon == WP_SABER)
{
anglesToSet = ANGLES_SABER;
VectorNegate(delta, delta);
}
float zxDist = length(delta[0], delta[2]);
if (zxDist != 0.0f && delta[2] != 0.0f) {
VectorSet(vr.weaponangles[anglesToSet], -RAD2DEG(atanf(delta[1] / zxDist)),
-RAD2DEG(atan2f(delta[0], -delta[2])), vr.weaponangles[anglesToSet][ROLL] /
2.0f); //Dampen roll on stabilised weapon
}
}
@ -575,21 +580,39 @@ void HandleInput_Default( ovrInputStateTrackedRemote *pDominantTrackedRemoteNew,
*/
// Check quicksave
static bool indicateQuickSave = true;
if (canUseQuickSave) {
int channel = (vr_control_scheme->integer >= 10) ? 1 : 0;
TBXR_Vibrate(40, channel, 0.5); // vibrate to let user know they can switch
if (((pOffTrackedRemoteNew->Buttons & offButton1) !=
(pOffTrackedRemoteOld->Buttons & offButton1)) &&
(pOffTrackedRemoteNew->Buttons & offButton1)) {
sendButtonActionSimple("savegame quicksave");
int channel = (vr_control_scheme->integer >= 10) ? 2 : 1;
if (indicateQuickSave)
{
TBXR_Vibrate(40, channel, 0.5); // vibrate to let user know they can switch
indicateQuickSave = false;
}
if (((pOffTrackedRemoteNew->Buttons & offButton2) !=
(pOffTrackedRemoteOld->Buttons & offButton2)) &&
(pOffTrackedRemoteNew->Buttons & offButton2)) {
sendButtonActionSimple("loadgame quicksave");
if (((secondaryButtonsNew & secondaryButton1) !=
(secondaryButtonsOld & secondaryButton1)) &&
(secondaryButtonsNew & secondaryButton1)) {
#ifdef JK2_MODE
sendButtonActionSimple("save quik*");
#else
sendButtonActionSimple("save quick");
#endif
}
if (((secondaryButtonsNew & secondaryButton2) !=
(secondaryButtonsOld & secondaryButton2)) &&
(secondaryButtonsNew & secondaryButton2)) {
#ifdef JK2_MODE
sendButtonActionSimple("load quik");
#else
sendButtonActionSimple("load quick");
#endif
}
}
else
{
//Next time we can quick save, allow a haptic blip
indicateQuickSave = true;
}
}

13
Projects/Android/jni/OpenJK/code/cgame/FxScheduler.cpp
View file

@ -999,19 +999,15 @@ void CFxScheduler::CreateEffect( CPrimitiveTemplate *fx, int clientID, int delay
case Particle:
//---------
if ( clientID >= 0 && clientID < ENTITYNUM_WORLD )
//Special handling for player muzzle flashes
if ( clientID == 0 )
{
if (clientID == 0)
{
flags = fx->mFlags | FX_DEPTH_HACK;
}
flags = fx->mFlags | FX_DEPTH_HACK;
// ..um, ok.....
centity_t *cent = &cg_entities[clientID];
if (cent && cent->gent && cent->gent->client)
{
FX_AddParticle(-1, cent->gent->client->renderInfo.muzzlePoint, vel, accel, fx->mGravity.GetVal(),
FX_AddParticle(-1, cent->gent->client->renderInfo.muzzlePoint, vel, accel, fx->mGravity.GetVal(),
fx->mSizeStart.GetVal(), fx->mSizeEnd.GetVal(), fx->mSizeParm.GetVal(),
fx->mAlphaStart.GetVal(), fx->mAlphaEnd.GetVal(),
fx->mAlphaParm.GetVal(),
@ -1024,6 +1020,7 @@ void CFxScheduler::CreateEffect( CPrimitiveTemplate *fx, int clientID, int delay
}
else
{
//Default behaviour
FX_AddParticle(clientID, org, vel, accel, fx->mGravity.GetVal(),
fx->mSizeStart.GetVal(), fx->mSizeEnd.GetVal(), fx->mSizeParm.GetVal(),
fx->mAlphaStart.GetVal(), fx->mAlphaEnd.GetVal(),