teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-01-21 00:20:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

- floatified Blood’s kViewEffectAtom

Browse source 
This also gets rid of the rather pointless rotation functions that were just added for this.
This commit is contained in:
Christoph Oelckers 2022-08-30 20:49:04 +02:00
parent ea9c88d952
commit b73314579a
3 changed files with 24 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
source/games/blood/src/animatesprite.cpp
View file

@ -42,41 +42,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
BEGIN_BLD_NS
static DAngle gCameraAng;
int dword_172CE0[16][3];
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
static void RotateYZ(int*, int* pY, int* pZ, int ang)
{
int oY, oZ, angSin, angCos;
oY = *pY;
oZ = *pZ;
angSin = Sin(ang);
angCos = Cos(ang);
*pY = dmulscale30r(oY, angCos, oZ, -angSin);
*pZ = dmulscale30r(oY, angSin, oZ, angCos);
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
static void RotateXZ(int* pX, int*, int* pZ, int ang)
{
int oX, oZ, angSin, angCos;
oX = *pX;
oZ = *pZ;
angSin = Sin(ang);
angCos = Cos(ang);
*pX = dmulscale30r(oX, angCos, oZ, -angSin);
*pZ = dmulscale30r(oX, angSin, oZ, angCos);
}
DAngle random_angles[16][3];
//---------------------------------------------------------------------------
//
@ -180,17 +146,21 @@ static tspritetype* viewAddEffect(tspriteArray& tsprites, int nTSprite, VIEW_EFF
if (!pNSprite)
break;
int ang = (PlayClock * 2048) / 120;
int nRand1 = dword_172CE0[i][0];
int nRand2 = dword_172CE0[i][1];
int nRand3 = dword_172CE0[i][2];
auto ang = DAngle::fromBuild((PlayClock * 2048) / 120).Normalized360();
auto nRand1 = random_angles[i][0];
auto nRand2 = random_angles[i][1];
auto nRand3 = random_angles[i][2];
ang += nRand3;
int x = MulScale(512, Cos(ang), 30);
int y = MulScale(512, Sin(ang), 30);
int z = 0;
RotateYZ(&x, &y, &z, nRand1);
RotateXZ(&x, &y, &z, nRand2);
pNSprite->set_int_pos({ pTSprite->int_pos().X + x, pTSprite->int_pos().Y + y, pTSprite->int_pos().Z + (z << 4) });
auto vect = DVector3(32 * ang.ToVector(), 0);
DVector2 pt(vect.Y, vect.Z);
pt = rotatepoint({0,0}, pt, nRand1);
vect.Y = pt.X;
pt.X = vect.X;
pt = rotatepoint({0,0}, pt, nRand2);
vect.X = pt.X;
vect.Z = pt.Y;
pNSprite->pos = pTSprite->pos + vect;
pNSprite->picnum = 1720;
pNSprite->shade = -128;
}

5
source/games/blood/src/misc.cpp
View file

@ -52,5 +52,10 @@ void wsrand(int seed)
wRandSeed = seed;
}
DAngle randomAngle()
{
return DAngle::fromQ16(wrand());
}
END_BLD_NS

8
source/games/blood/src/view.cpp
View file

@ -160,7 +160,7 @@ void viewDrawAimedPlayerName(void)
static TArray<uint8_t> lensdata;
int* lensTable;
extern int dword_172CE0[16][3];
extern DAngle random_angles[16][3];
//---------------------------------------------------------------------------
//
@ -187,9 +187,9 @@ void viewInit(void)
for (int i = 0; i < 16; i++)
{
dword_172CE0[i][0] = MulScale(wrand(), 2048, 16);
dword_172CE0[i][1] = MulScale(wrand(), 2048, 16);
dword_172CE0[i][2] = MulScale(wrand(), 2048, 16);
random_angles[i][0] = randomAngle();
random_angles[i][1] = randomAngle();
random_angles[i][2] = randomAngle();
}
}