teambeef/jkxr
0
0
Fork 0
mirror of https://github.com/DrBeef/JKXR.git synced 2025-01-31 20:50:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Draw sabers in correct position when in enemy lock

Browse source 
and don't draw in security camera views
This commit is contained in:
Simon 2023-03-12 10:49:04 +00:00
parent be59694bc5
commit a67dc074cb
1 changed files with 49 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
Projects/Android/jni/OpenJK/code/cgame/cg_players.cpp
View file

@ -6121,6 +6121,8 @@ Ghoul2 Insert Start
if (!cent->gent->client->ps.saberInFlight && if (!cent->gent->client->ps.saberInFlight &&
CG_getPlayer1stPersonSaber(cent) && CG_getPlayer1stPersonSaber(cent) &&
!in_misccamera &&
!in_camera &&
cent->gent->client->ps.saberLockEnemy == ENTITYNUM_NONE) cent->gent->client->ps.saberLockEnemy == ENTITYNUM_NONE)
{ {
vec3_t angles; vec3_t angles;
@ -6797,30 +6799,54 @@ Ghoul2 Insert End
cgi_HapticEvent("shotgun_fire", 0, 0, 100, 0, 0); cgi_HapticEvent("shotgun_fire", 0, 0, 100, 0, 0);
} }
/* if (CG_getPlayer1stPersonSaber(cent) && //Draw the saber hilts in the appropriate locked location
if (CG_getPlayer1stPersonSaber(cent) &&
cent->gent->client->ps.saberLockEnemy != ENTITYNUM_NONE) cent->gent->client->ps.saberLockEnemy != ENTITYNUM_NONE)
{ {
int numSabers = 1;
if ( cent->gent->client->ps.dualSabers )
{
numSabers = 2;
}
for ( int saberNum = 0; saberNum < numSabers; saberNum++ )
{
if (saberNum == 0 && cent->currentState.saberInFlight)
{
continue;
}
refEntity_t hiltEnt; refEntity_t hiltEnt;
memset( &hiltEnt, 0, sizeof(refEntity_t) ); memset( &hiltEnt, 0, sizeof(refEntity_t) );
hiltEnt.hModel = cgs.media.saberHilt;
VectorCopy(org_, hiltEnt.origin); VectorCopy(org_, hiltEnt.origin);
VectorCopy(hiltEnt.origin, hiltEnt.oldorigin); VectorCopy(hiltEnt.origin, hiltEnt.oldorigin);
vectoangles(axis_[0], hiltEnt.angles); vectoangles(axis_[0], hiltEnt.angles);
int saberModelIndex = G_ModelIndex( cent->gent->client->ps.saber[saberNum].model );
if (saberModelIndex != cg.saberModelIndex[saberNum])
{
if (cg.saber_ghoul2[saberNum].size() != 0)
{
gi.G2API_RemoveGhoul2Model(cg.saber_ghoul2[saberNum], cg.saberG2Num[saberNum]);
}
cg.saberG2Num[saberNum] = gi.G2API_InitGhoul2Model( cg.saber_ghoul2[saberNum], cent->gent->client->ps.saber[saberNum].model, saberModelIndex , NULL_HANDLE, NULL_HANDLE, 0, 0 );
cg.saberModelIndex[saberNum] = saberModelIndex;
}
hiltEnt.ghoul2 = &cg.saber_ghoul2[saberNum];
hiltEnt.hModel = cgs.model_draw[0];
VectorSet( hiltEnt.modelScale, 0.8f, 0.8f, 0.8f ); // Scale down slightly or they are all just too big
hiltEnt.radius = 60;
vec3_t axis[3]; vec3_t axis[3];
AnglesToAxis(hiltEnt.angles, axis); AnglesToAxis(hiltEnt.angles, axis);
VectorSubtract(vec3_origin, axis[2], hiltEnt.axis[0]); VectorSubtract(vec3_origin, axis[2], hiltEnt.axis[0]);
VectorCopy(axis[1], hiltEnt.axis[1]); VectorCopy(axis[1], hiltEnt.axis[1]);
VectorCopy(axis[0], hiltEnt.axis[2]); VectorCopy(axis[0], hiltEnt.axis[2]);
VectorMA(hiltEnt.origin, 1.0f, hiltEnt.axis[2], hiltEnt.origin);
VectorCopy(hiltEnt.origin, hiltEnt.oldorigin); VectorCopy(hiltEnt.origin, hiltEnt.oldorigin);
cgi_R_AddRefEntityToScene(&hiltEnt); cgi_R_AddRefEntityToScene(&hiltEnt);
} }
*/ }
} }
void CG_AddSaberBlade( centity_t *cent, centity_t *scent, refEntity_t *saber, int renderfx, int modelIndex, vec3_t origin, vec3_t angles ) void CG_AddSaberBlade( centity_t *cent, centity_t *scent, refEntity_t *saber, int renderfx, int modelIndex, vec3_t origin, vec3_t angles )
@ -8480,11 +8506,12 @@ Ghoul2 Insert End
} }
if (CG_getPlayer1stPersonSaber(cent) && !vr->item_selector && if (CG_getPlayer1stPersonSaber(cent) &&
!vr->item_selector &&
!in_misccamera &&
!in_camera &&
cent->gent->client->ps.saberLockEnemy == ENTITYNUM_NONE) cent->gent->client->ps.saberLockEnemy == ENTITYNUM_NONE)
{ {
gentity_t *main_saber = &g_entities[cent->gent->client->ps.saberEntityNum];
int numSabers = 1; int numSabers = 1;
if ( cent->gent->client->ps.dualSabers ) if ( cent->gent->client->ps.dualSabers )
{ {
@ -8508,7 +8535,6 @@ Ghoul2 Insert End
if (cg.saber_ghoul2[saberNum].size() != 0) if (cg.saber_ghoul2[saberNum].size() != 0)
{ {
gi.G2API_RemoveGhoul2Model(cg.saber_ghoul2[saberNum], cg.saberG2Num[saberNum]); gi.G2API_RemoveGhoul2Model(cg.saber_ghoul2[saberNum], cg.saberG2Num[saberNum]);
//cg.saber_ghoul2[saberNum].clear();
} }
cg.saberG2Num[saberNum] = gi.G2API_InitGhoul2Model( cg.saber_ghoul2[saberNum], cent->gent->client->ps.saber[saberNum].model, saberModelIndex , NULL_HANDLE, NULL_HANDLE, 0, 0 ); cg.saberG2Num[saberNum] = gi.G2API_InitGhoul2Model( cg.saber_ghoul2[saberNum], cent->gent->client->ps.saber[saberNum].model, saberModelIndex , NULL_HANDLE, NULL_HANDLE, 0, 0 );
cg.saberModelIndex[saberNum] = saberModelIndex; cg.saberModelIndex[saberNum] = saberModelIndex;