summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authormajestic <majesticcoding@gmail.com>2020-06-10 23:01:37 +0200
committermajestic <majesticcoding@gmail.com>2020-06-10 23:01:37 +0200
commitcf8fcada6e9989c7c5ea88a797b98914de815aec (patch)
treede4601da3ebb815eacc6f59fdc574a5fa072cbe8 /src
parentSmokeTrail(s) moved to Fluff, variables' names fixed, floats rounded (diff)
downloadre3-cf8fcada6e9989c7c5ea88a797b98914de815aec.tar
re3-cf8fcada6e9989c7c5ea88a797b98914de815aec.tar.gz
re3-cf8fcada6e9989c7c5ea88a797b98914de815aec.tar.bz2
re3-cf8fcada6e9989c7c5ea88a797b98914de815aec.tar.lz
re3-cf8fcada6e9989c7c5ea88a797b98914de815aec.tar.xz
re3-cf8fcada6e9989c7c5ea88a797b98914de815aec.tar.zst
re3-cf8fcada6e9989c7c5ea88a797b98914de815aec.zip
Diffstat (limited to '')
-rw-r--r--src/render/Fluff.cpp8
-rw-r--r--src/render/Fluff.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/render/Fluff.cpp b/src/render/Fluff.cpp
index 582468e7..9074ee66 100644
--- a/src/render/Fluff.cpp
+++ b/src/render/Fluff.cpp
@@ -896,7 +896,7 @@ CSmokeTrail::RegisterPoint(CVector regPosition, float opacity) {
for (int32 i = 15; i > 0; i--) {
m_pos[i] = m_pos[i - 1];
m_time[i] = m_time[i - 1];
- m_density[i] = m_density[i - 1];
+ m_opacity[i] = m_opacity[i - 1];
}
++m_seed;
}
@@ -905,9 +905,9 @@ CSmokeTrail::RegisterPoint(CVector regPosition, float opacity) {
if (bAddedNewPoint || !m_time[0]) {
m_time[0] = CTimer::GetTimeInMilliseconds();
float density = 0.1f / (m_pos[1] - m_pos[2]).Magnitude();
- m_density[1] = opacity * Min(density, 1.0f);
+ m_opacity[1] = opacity * Min(density, 1.0f);
}
- m_density[0] = 0.0f;
+ m_opacity[0] = 0.0f;
}
void
@@ -942,7 +942,7 @@ CSmokeTrail::Render(void) {
m_time[i] = 0;
if (m_time[i]) {
- int alpha = (1.0f - timeSinceSpawned / 2250.0f) * 110.0f * m_density[i];
+ int alpha = (1.0f - timeSinceSpawned / 2250.0f) * 110.0f * m_opacity[i];
float offset = timeSinceSpawned * CWeather::Wind * 0.0001f;
float posX = (m_pos[i].x + timeSinceSpawned * RandomSmoke[(i - m_seed) & 0xF] * 0.00001f) - offset;
float posY = (m_pos[i].y + timeSinceSpawned * RandomSmoke[(i - m_seed + 5) & 0xF] * 0.00001f) - offset;
diff --git a/src/render/Fluff.h b/src/render/Fluff.h
index 958de5b5..41db75ec 100644
--- a/src/render/Fluff.h
+++ b/src/render/Fluff.h
@@ -107,7 +107,7 @@ public:
class CSmokeTrail {
CVector m_pos[16];
- float m_density[16];
+ float m_opacity[16];
int m_time[16];
char m_unused[536];
int m_seed;