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

Add optional direction parameters for SprayDecal and its A_SprayDecal zscript counterpart

Browse source
This commit is contained in:
Mekboss 2020-03-30 14:27:36 +03:00 committed by Christoph Oelckers
parent 50e0353668
commit ba43244764
4 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/playsim/a_decals.cpp
View file

@ -830,14 +830,23 @@ DBaseDecal *DImpactDecal::CloneSelf (const FDecalTemplate *tpl, double ix, doubl
// //
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void SprayDecal(AActor *shooter, const char *name, double distance) void SprayDecal(AActor *shooter, const char *name, double distance, double DirX, double DirY, double DirZ)
{ {
FTraceResults trace; FTraceResults trace;
DVector3 vec;
DAngle ang = shooter->Angles.Yaw; //use new behavior only if directional vector not equal to zero vector
DAngle pitch = shooter->Angles.Pitch; if (DirX != 0 || DirY != 0 || DirZ != 0)
double c = pitch.Cos(); {
DVector3 vec(c * ang.Cos(), c * ang.Sin(), -pitch.Sin()); vec = DVector3(DirX, DirY, DirZ);
}
else
{
DAngle ang = shooter->Angles.Yaw;
DAngle pitch = shooter->Angles.Pitch;
double c = pitch.Cos();
vec = DVector3(c * ang.Cos(), c * ang.Sin(), -pitch.Sin());
}
if (Trace(shooter->PosPlusZ(shooter->Height / 2), shooter->Sector, vec, distance, 0, ML_BLOCKEVERYTHING, shooter, trace, TRACE_NoSky)) if (Trace(shooter->PosPlusZ(shooter->Height / 2), shooter->Sector, vec, distance, 0, ML_BLOCKEVERYTHING, shooter, trace, TRACE_NoSky))
{ {

2
src/playsim/a_sharedglobal.h
View file

@ -12,7 +12,7 @@ class DBaseDecal;
struct SpreadInfo; struct SpreadInfo;
DBaseDecal *ShootDecal(FLevelLocals *Level, const FDecalTemplate *tpl, sector_t *sec, double x, double y, double z, DAngle angle, double tracedist, bool permanent); DBaseDecal *ShootDecal(FLevelLocals *Level, const FDecalTemplate *tpl, 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.); void SprayDecal(AActor *shooter, const char *name,double distance = 172., double DirX = 0., double DirY = 0., double DirZ = 0.);
class DBaseDecal : public DThinker class DBaseDecal : public DThinker
{ {

5
src/playsim/p_actionfunctions.cpp
View file

@ -4917,7 +4917,10 @@ DEFINE_ACTION_FUNCTION(AActor, A_SprayDecal)
PARAM_SELF_PROLOGUE(AActor); PARAM_SELF_PROLOGUE(AActor);
PARAM_STRING(name); PARAM_STRING(name);
PARAM_FLOAT(dist); PARAM_FLOAT(dist);
SprayDecal(self, name, dist); PARAM_FLOAT(DirX);
PARAM_FLOAT(DirY);
PARAM_FLOAT(DirZ);
SprayDecal(self, name, dist, DirX, DirY, DirZ);
return 0; return 0;
} }

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

@ -1157,7 +1157,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 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 void A_SetTranslation(name transname);
native bool A_SetSize(double newradius = -1, double newheight = -1, bool testpos = false); native bool A_SetSize(double newradius = -1, double newheight = -1, bool testpos = false);
native void A_SprayDecal(String name, double dist = 172); native void A_SprayDecal(String name, double dist = 172, double DirX = 0, double DirY = 0, double DirZ = 0);
native void A_SetMugshotState(String name); native void A_SetMugshotState(String name);
native void CopyBloodColor(Actor other); native void CopyBloodColor(Actor other);