Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-04-28 15:57:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Count life in game frames

Browse source
This commit is contained in:
Sezz 2025-03-06 22:43:48 +11:00
parent 3ce5453e12
commit 558fe0abee
2 changed files with 51 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

66
TombEngine/Game/effects/Blood.cpp
View file

@ -41,12 +41,12 @@ namespace TEN::Effects::Blood
constexpr auto SOUND_PITCH_MAX = 4.0f;
constexpr auto SOUND_VOL = 1.0f;
if (Life <= 0.0f)
if (Life <= 0)
return;
// Update opacity.
if (Life <= LifeStartFading)
Opacity = Lerp(1.0f, 0.0f, 1.0f - (Life / std::round(LIFE_START_FADING * FPS)));
Opacity = Lerp(1.0f, 0.0f, 1.0f - ((float)Life / std::round(LIFE_START_FADING * FPS)));
// Update color.
Color.w = Opacity;
@ -66,12 +66,12 @@ namespace TEN::Effects::Blood
// Deactivate on wall hit.
if (pointColl.IsWall())
{
Life = 0.0f;
Life = 0;
}
// Spawn underwater blood.
else if (TestEnvironment(ENV_FLAG_WATER, RoomNumber))
{
Life = 0.0f;
Life = 0;
float size = Size * 5;
UnderwaterBloodCloudEffect.Spawn(Position, RoomNumber, size);
@ -79,20 +79,20 @@ namespace TEN::Effects::Blood
// Spawn stain on floor.
else if (Position.y >= pointColl.GetFloorHeight() && Position.y <= (pointColl.GetFloorHeight() + Velocity.y))
{
Life = 0.0f;
Life = 0;
BloodStainEffect.Spawn(*this, pointColl, true);
SoundEffect(SOUND_ID, &Pose(Vector3i(Position)), SoundEnvironment::Always, Random::GenerateFloat(SOUND_PITCH_MIN, SOUND_PITCH_MAX), SOUND_VOL);
}
// Spawn stain on ceiling.
else if (Position.y <= pointColl.GetCeilingHeight() && Position.y >= (pointColl.GetCeilingHeight() + Velocity.y))
{
Life = 0.0f;
Life = 0;
BloodStainEffect.Spawn(*this, pointColl, false);
SoundEffect(SOUND_ID, &Pose(Vector3i(Position)), SoundEnvironment::Always, Random::GenerateFloat(SOUND_PITCH_MIN, SOUND_PITCH_MAX), SOUND_VOL);
}
// Update life.
Life -= 1.0f;
Life--;
}
const std::vector<BloodDripEffectParticle>& BloodDripEffectController::GetParticles()
@ -115,8 +115,8 @@ namespace TEN::Effects::Blood
part.Size = size;
part.Velocity = vel;
part.Color = BLOOD_COLOR_RED;
part.Life = std::round(lifeInSec * FPS);
part.LifeStartFading = std::round(BloodDripEffectParticle::LIFE_START_FADING * FPS);
part.Life = (int)std::round(lifeInSec * FPS);
part.LifeStartFading = (int)std::round(BloodDripEffectParticle::LIFE_START_FADING * FPS);
part.Opacity = 0.8f;
part.Gravity = Random::GenerateFloat(GRAVITY_MIN, GRAVITY_MAX);
}
@ -141,15 +141,15 @@ namespace TEN::Effects::Blood
{
constexpr auto ABS_SURF_HEIGHT_BOUND = CLICK(0.5f);
if (Life <= 0.0f)
if (Life <= 0)
return;
// Update delay time.
if (DelayTime > 0.0f)
if (DelayTime > 0)
{
DelayTime -= 1.0f;
if (DelayTime < 0.0f)
DelayTime = 0.0f;
DelayTime--;
if (DelayTime < 0)
DelayTime = 0;
return;
}
@ -182,17 +182,17 @@ namespace TEN::Effects::Blood
// Update opacity.
if (Life <= LifeStartFading)
{
float alpha = 1.0f - (Life / std::round(BloodStainEffectParticle::LIFE_START_FADING * FPS));
float alpha = 1.0f - ((float)Life / std::round(BloodStainEffectParticle::LIFE_START_FADING * FPS));
Opacity = Lerp(OpacityMax, 0.0f, alpha);
}
// Update color.
float alpha = 1.0f - (Life / std::round(BloodStainEffectParticle::LIFE_MAX * FPS));
float alpha = 1.0f - ((float)Life / std::round(BloodStainEffectParticle::LIFE_MAX * FPS));
Color = Vector4::Lerp(ColorStart, ColorEnd, alpha);
Color.w = Opacity;
// Update life.
Life -= 1.0f;
Life--;
if (TestGlobalTimeInterval(COLL_CHECK_TIME_INTERVAL, CollCheckTimeOffset))
{
// TODO: Better handling of moving surfaces.
@ -201,7 +201,7 @@ namespace TEN::Effects::Blood
if ((IsOnFloor && abs(pointColl.GetFloorHeight() - Position.y) > ABS_SURF_HEIGHT_BOUND) ||
(!IsOnFloor && abs(pointColl.GetCeilingHeight() - Position.y) > ABS_SURF_HEIGHT_BOUND))
{
Life = 0.0f;
Life = 0;
}
}
}
@ -292,14 +292,14 @@ namespace TEN::Effects::Blood
part.ColorStart = BLOOD_COLOR_RED;
part.ColorEnd = BLOOD_COLOR_BROWN;
part.Vertices = part.GetVertices();
part.Life = std::round(BloodStainEffectParticle::LIFE_MAX * FPS);
part.LifeStartFading = std::round(BloodStainEffectParticle::LIFE_START_FADING * FPS);
part.Life = (int)std::round(BloodStainEffectParticle::LIFE_MAX * FPS);
part.LifeStartFading = (int)std::round(BloodStainEffectParticle::LIFE_START_FADING * FPS);
part.Size = 0.0f;
part.SizeMax = size;
part.Scalar = scalar;
part.Opacity =
part.OpacityMax = OPACITY_MAX;
part.DelayTime = std::round(delayInSec * FPS);
part.DelayTime = (int)std::round(delayInSec * FPS);
}
void BloodStainEffectController::Spawn(const BloodDripEffectParticle& drip, PointCollisionData& pointColl, bool isOnFloor)
@ -382,7 +382,7 @@ namespace TEN::Effects::Blood
part.Position = Random::GeneratePointOnSphere(sphere);
part.RoomNumber = roomNumber;
part.Color = BLOOD_COLOR_RED;
part.Life = 1.0f;
part.Life = 1;
part.Size = size;
}
@ -409,7 +409,7 @@ namespace TEN::Effects::Blood
void BloodMistEffectParticle::Update()
{
if (Life <= 0.0f)
if (Life <= 0)
return;
// Update velocity.
@ -421,14 +421,14 @@ namespace TEN::Effects::Blood
Orientation2D += Rotation;
// Update size.
Size = Lerp(SizeMin, SizeMax, 1.0f - (Life / LifeMax));
Size = Lerp(SizeMin, SizeMax, 1.0f - ((float)Life / (float)LifeMax));
// Update opacity.
Opacity = Lerp(OpacityMax, 0.0f, 1.0f - (Life / LifeMax));
Opacity = Lerp(OpacityMax, 0.0f, 1.0f - ((float)Life / (float)LifeMax));
Color.w = Opacity;
// Update life.
Life -= 1.0f;
Life--;
}
const std::vector<BloodMistEffectParticle>& BloodMistEffectController::GetParticles()
@ -439,8 +439,8 @@ namespace TEN::Effects::Blood
void BloodMistEffectController::Spawn(const Vector3& pos, int roomNumber, const Vector3& dir, unsigned int count)
{
constexpr auto COUNT_MAX = 256;
constexpr auto LIFE_MAX = 1.0f;
constexpr auto LIFE_MIN = 0.5f;
constexpr auto LIFE_MAX = 1.0f; // Life in seconds.
constexpr auto LIFE_MIN = 0.5f; // Life in seconds.
constexpr auto VEL_MAX = 16.0f;
constexpr auto MIST_SIZE_MAX = 128.0f;
constexpr auto MIST_SIZE_MIN = 64.0f;
@ -471,7 +471,7 @@ namespace TEN::Effects::Blood
part.Velocity = Random::GenerateDirectionInCone(dir, CONE_SEMIANGLE) * Random::GenerateFloat(0.0f, VEL_MAX);
part.Color = BLOOD_COLOR_RED;
part.Life =
part.LifeMax = std::round(Random::GenerateFloat(LIFE_MIN, LIFE_MAX) * FPS);
part.LifeMax = (int)std::round(Random::GenerateFloat(LIFE_MIN, LIFE_MAX) * FPS);
part.Size = Random::GenerateFloat(MIST_SIZE_MIN, MIST_SIZE_MAX);
part.SizeMax = part.Size * MIST_SIZE_MAX_MULT;
part.SizeMin = part.Size;
@ -508,7 +508,7 @@ namespace TEN::Effects::Blood
{
constexpr auto PART_SIZE_MAX = BLOCK(0.25f);
if (Life <= 0.0f)
if (Life <= 0)
return;
// Update size.
@ -518,7 +518,7 @@ namespace TEN::Effects::Blood
// Update life.
if (Init == 0.0f)
{
Life -= 3.0f;
Life -= 3;
}
else if (Init < Life)
{
@ -546,7 +546,7 @@ namespace TEN::Effects::Blood
part.SpriteID = 0;
part.Position = Random::GeneratePointInSphere(sphere);
part.RoomNumber = roomNumber;
part.Life = std::round(Random::GenerateFloat(LIFE_MIN, LIFE_MAX) * FPS);
part.Life = (int)std::round(Random::GenerateFloat(LIFE_MIN, LIFE_MAX) * FPS);
part.Init = 1.0f;
part.Size = size;
}
@ -570,7 +570,7 @@ namespace TEN::Effects::Blood
void SpawnBloodSplatEffect(const Vector3& pos, int roomNumber, const Vector3& dir, const Vector3& baseVel, unsigned int count)
{
constexpr auto DRIP_LIFE = 2.0f;
constexpr auto DRIP_LIFE = 2.0f; // Life in seconds.
constexpr auto DRIP_SIZE_MAX = BLOCK(1 / 64.0f);
constexpr auto DRIP_SIZE_MIN = DRIP_SIZE_MAX / 2;
constexpr auto DRIP_VEL_MAX = BLOCK(1 / 32.0f);

36
TombEngine/Game/effects/Blood.h
View file

@ -13,7 +13,7 @@ namespace TEN::Effects::Blood
{
struct BloodDripEffectParticle
{
static constexpr auto LIFE_START_FADING = 0.5f;
static constexpr auto LIFE_START_FADING = 0.5f; // Time in seconds.
GAME_OBJECT_ID SpriteSeqID = GAME_OBJECT_ID::ID_DEFAULT_SPRITES;
int SpriteID = 0;
@ -23,8 +23,8 @@ namespace TEN::Effects::Blood
Vector3 Velocity = Vector3::Zero;
Vector4 Color = Vector4::Zero;
float Life = 0.0f;
float LifeStartFading = 0.0f;
int Life = 0; // Time in game frames.
int LifeStartFading = 0; // Time in game frames.
float Size = 0.0f;
float Opacity = 0.0f;
float Gravity = 0.0f;
@ -35,7 +35,7 @@ namespace TEN::Effects::Blood
class BloodDripEffectController
{
private:
// Members
// Fields
std::vector<BloodDripEffectParticle> _particles;
@ -56,11 +56,11 @@ namespace TEN::Effects::Blood
struct BloodStainEffectParticle
{
static constexpr auto LIFE_MAX = 5.0f * 60.0f;
static constexpr auto LIFE_START_FADING = 15.0f;
static constexpr auto LIFE_MAX = 5.0f * 60.0f; // Time in seconds.
static constexpr auto LIFE_START_FADING = 15.0f; // Time in seconds.
static constexpr auto COLL_CHECK_TIME_INTERVAL = 0.5f; // Time in seconds.
static constexpr auto SURFACE_OFFSET = 4;
static constexpr auto VERTEX_COUNT = 4;
static constexpr auto COLL_CHECK_TIME_INTERVAL = 0.5f;
GAME_OBJECT_ID SpriteSeqID = GAME_OBJECT_ID::ID_DEFAULT_SPRITES;
int SpriteID = 0;
@ -75,14 +75,14 @@ namespace TEN::Effects::Blood
std::array<Vector3, VERTEX_COUNT> Vertices = {};
float Life = 0.0f;
float LifeStartFading = 0.0f;
int Life = 0; // Time in game frames.
int LifeStartFading = 0; // Time in game frames.
float Size = 0.0f;
float SizeMax = 0.0f;
float Scalar = 0.0f;
float Opacity = 0.0f;
float OpacityMax = 0.0f;
float DelayTime = 0.0f;
int DelayTime = 0;
bool IsOnFloor = false;
float CollCheckTimeOffset = 0.0f;
@ -96,7 +96,7 @@ namespace TEN::Effects::Blood
class BloodStainEffectController
{
private:
// Members
// Fields
std::vector<BloodStainEffectParticle> _particles = {};
@ -126,7 +126,7 @@ namespace TEN::Effects::Blood
int RoomNumber = 0;
Vector4 Color = Vector4::Zero;
float Life = 0.0f;
int Life = 0; // Time in game frames.
float Size = 0.0f;
void Update();
@ -135,7 +135,7 @@ namespace TEN::Effects::Blood
class BloodBillboardEffectController
{
private:
// Members
// Fields
std::vector<BloodBillboardEffectParticle> _particles = {};
@ -165,8 +165,8 @@ namespace TEN::Effects::Blood
Vector3 Velocity = Vector3::Zero;
Vector4 Color = Vector4::Zero;
float Life = 0.0f;
float LifeMax = 0.0f;
int Life = 0; // Time in game frames.
int LifeMax = 0; // Time in game frames.
float Size = 0.0f;
float SizeMax = 0.0f;
float SizeMin = 0.0f;
@ -182,7 +182,7 @@ namespace TEN::Effects::Blood
class BloodMistEffectController
{
private:
// Members
// Fields
std::vector<BloodMistEffectParticle> _particles = {};
@ -211,7 +211,7 @@ namespace TEN::Effects::Blood
int RoomNumber = 0;
Vector4 Color = Vector4::Zero;
float Life = 0.0f;
int Life = 0; // Time in game frames.
float Init = 0.0f;
float Size = 0.0f;
float Opacity = 0.0f;
@ -222,7 +222,7 @@ namespace TEN::Effects::Blood
class UnderwaterBloodCloudEffectController
{
private:
// Members
// Fields
std::vector<UnderwaterBloodCloudEffectParticle> _particles;