a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-06-29 10:47:06 +00:00
Code Issues Projects Releases Wiki Activity

m_density renamed to m_opacity

Browse source
This commit is contained in:
majestic 2020-06-10 14:01:37 -07:00
parent 287987b8fe
commit cf8fcada6e
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/render/Fluff.cpp
View file

@ -896,7 +896,7 @@ CSmokeTrail::RegisterPoint(CVector regPosition, float opacity) {
for (int32 i = 15; i > 0; i--) { for (int32 i = 15; i > 0; i--) {
m_pos[i] = m_pos[i - 1]; m_pos[i] = m_pos[i - 1];
m_time[i] = m_time[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; ++m_seed;
} }
@ -905,9 +905,9 @@ CSmokeTrail::RegisterPoint(CVector regPosition, float opacity) {
if (bAddedNewPoint || !m_time[0]) { if (bAddedNewPoint || !m_time[0]) {
m_time[0] = CTimer::GetTimeInMilliseconds(); m_time[0] = CTimer::GetTimeInMilliseconds();
float density = 0.1f / (m_pos[1] - m_pos[2]).Magnitude(); 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 void
@ -942,7 +942,7 @@ CSmokeTrail::Render(void) {
m_time[i] = 0; m_time[i] = 0;
if (m_time[i]) { 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 offset = timeSinceSpawned * CWeather::Wind * 0.0001f;
float posX = (m_pos[i].x + timeSinceSpawned * RandomSmoke[(i - m_seed) & 0xF] * 0.00001f) - offset; 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; float posY = (m_pos[i].y + timeSinceSpawned * RandomSmoke[(i - m_seed + 5) & 0xF] * 0.00001f) - offset;

2
src/render/Fluff.h
View file

@ -107,7 +107,7 @@ public:
class CSmokeTrail { class CSmokeTrail {
CVector m_pos[16]; CVector m_pos[16];
float m_density[16]; float m_opacity[16];
int m_time[16]; int m_time[16];
char m_unused[536]; char m_unused[536];
int m_seed; int m_seed;