zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-15 00:51:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix MSVS compile bug and add offset parameter for SprayDecal

Browse source 
# Conflicts:
#	src/g_shared/a_sharedglobal.h
This commit is contained in:
Mekboss 2020-04-07 23:11:49 +03:00 committed by drfrag
parent 6e30ac5f3c
commit b658d4c225
4 changed files with 30 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/g_shared/a_decals.cpp
View file

@ -740,25 +740,36 @@ CCMD (spray)
Net_WriteString (argv[1]);
}
void SprayDecal(AActor *shooter, const char *name, double distance, DVector3 Dir)
void SprayDecal(AActor *shooter, const char *name, double distance, DVector3 offset, DVector3 direction)
{
//just in case
if (!shooter)
return;
FTraceResults trace;
DVector3 vec;
//use new behavior only if directional vector not equal to zero vector
if (!Dir.isZero() )
{
vec = Dir;
}
DVector3 off(0, 0, 0), dir(0, 0, 0);
//use vanilla offset only if "custom" equal to zero
if (offset.isZero() )
off = shooter->PosPlusZ(shooter->Height / 2);
else
off = shooter->Pos() + offset;
//same for direction
if (direction.isZero() )
{
DAngle ang = shooter->Angles.Yaw;
DAngle pitch = shooter->Angles.Pitch;
double c = pitch.Cos();
vec = DVector3(c * ang.Cos(), c * ang.Sin(), -pitch.Sin());
dir = DVector3(c * ang.Cos(), c * ang.Sin(), -pitch.Sin());
}
else
dir = direction;
if (Trace(shooter->PosPlusZ(shooter->Height / 2), shooter->Sector, vec, distance, 0, ML_BLOCKEVERYTHING, shooter, trace, TRACE_NoSky))
if (Trace(off, shooter->Sector, dir, distance, 0, ML_BLOCKEVERYTHING, shooter, trace, TRACE_NoSky))
{
if (trace.HitType == TRACE_HitWall)
{

2
src/g_shared/a_sharedglobal.h
View file

@ -11,7 +11,7 @@ struct F3DFloor;
class DBaseDecal;
class DBaseDecal *ShootDecal(const FDecalTemplate *tpl, AActor *basisactor, sector_t *sec, double x, double y, double z, DAngle angle, double tracedist, bool permanent);
void SprayDecal(AActor *shooter, const char *name,double distance = 172., DVector3 Dir = (0, 0, 0) );
void SprayDecal(AActor *shooter, const char *name,double distance = 172., DVector3 offset = DVector3(0., 0., 0.), DVector3 direction = DVector3(0., 0., 0.) );
class DBaseDecal : public DThinker
{

11
src/p_actionfunctions.cpp
View file

@ -4927,10 +4927,13 @@ DEFINE_ACTION_FUNCTION(AActor, A_SprayDecal)
PARAM_SELF_PROLOGUE(AActor);
PARAM_STRING(name);
PARAM_FLOAT(dist);
PARAM_FLOAT(DirX);
PARAM_FLOAT(DirY);
PARAM_FLOAT(DirZ);
SprayDecal(self, name, dist, DVector3(DirX, DirY, DirZ) );
PARAM_FLOAT(offset_x);
PARAM_FLOAT(offset_y);
PARAM_FLOAT(offset_z);
PARAM_FLOAT(direction_x);
PARAM_FLOAT(direction_y);
PARAM_FLOAT(direction_z);
SprayDecal(self, name, dist, DVector3(offset_x, offset_y, offset_z), DVector3(direction_x, direction_y, direction_z) );
return 0;
}

2
wadsrc/static/zscript/actors/actor.zs
View file

@ -1152,7 +1152,7 @@ class Actor : Thinker native
native bool A_SetVisibleRotation(double anglestart = 0, double angleend = 0, double pitchstart = 0, double pitchend = 0, int flags = 0, int ptr = AAPTR_DEFAULT);
native void A_SetTranslation(name transname);
native bool A_SetSize(double newradius = -1, double newheight = -1, bool testpos = false);
native void A_SprayDecal(String name, double dist = 172, vector3 Dir = (0, 0, 0) );
native void A_SprayDecal(String name, double dist = 172, vector3 offset = (0, 0, 0), vector3 direction = (0, 0, 0) );
native void A_SetMugshotState(String name);
native void CopyBloodColor(Actor other);