mirror of https://github.com/AxioDL/metaforce.git
CParticleSwoosh: Use const where applicable
Given the length of some functions, this makes following flow nicer, since it's easier to visually see which variables get modified.
This commit is contained in:
Lioncash
parent
6fbf6734c2
commit
fed72614ef
|
|
@ -35,32 +35,36 @@ CParticleSwoosh::CParticleSwoosh(const TToken<CSwooshDescription>& desc, int len
|
|||
}
|
||||
x1b4_LENG += 1;
|
||||
|
||||
if (CIntElement* side = x1c_desc->x18_SIDE.get())
|
||||
if (CIntElement* side = x1c_desc->x18_SIDE.get()) {
|
||||
side->GetValue(0, x1b8_SIDE);
|
||||
}
|
||||
|
||||
x1d0_28_LLRD = x1c_desc->x44_24_LLRD;
|
||||
x1d0_29_VLS1 = x1c_desc->x44_26_VLS1;
|
||||
x1d0_30_VLS2 = x1c_desc->x44_27_VLS2;
|
||||
|
||||
if (IsValid()) {
|
||||
if (CIntElement* pslt = x1c_desc->x0_PSLT.get())
|
||||
if (CIntElement* pslt = x1c_desc->x0_PSLT.get()) {
|
||||
pslt->GetValue(0, x2c_PSLT);
|
||||
else
|
||||
} else {
|
||||
x2c_PSLT = INT_MAX;
|
||||
}
|
||||
|
||||
x1d0_25_AALP = x1c_desc->x44_31_AALP;
|
||||
|
||||
if (CIntElement* spln = x1c_desc->x38_SPLN.get())
|
||||
if (CIntElement* spln = x1c_desc->x38_SPLN.get()) {
|
||||
spln->GetValue(0, x1b0_SPLN);
|
||||
if (x1b0_SPLN < 0)
|
||||
}
|
||||
if (x1b0_SPLN < 0) {
|
||||
x1b0_SPLN = 0;
|
||||
}
|
||||
|
||||
x15c_swooshes.clear();
|
||||
x15c_swooshes.reserve(x1b4_LENG);
|
||||
for (int i = 0; i < x1b4_LENG; ++i)
|
||||
x15c_swooshes.emplace_back(zeus::skZero3f, zeus::skZero3f, 0.f, 0.f, 0, false,
|
||||
zeus::CTransform(), zeus::skZero3f, 0.f, 0.f,
|
||||
zeus::skClear);
|
||||
for (int i = 0; i < x1b4_LENG; ++i) {
|
||||
x15c_swooshes.emplace_back(zeus::skZero3f, zeus::skZero3f, 0.f, 0.f, 0, false, zeus::CTransform(), zeus::skZero3f,
|
||||
0.f, 0.f, zeus::skClear);
|
||||
}
|
||||
|
||||
SetOrientation(zeus::CTransform());
|
||||
|
||||
|
|
@ -70,11 +74,11 @@ CParticleSwoosh::CParticleSwoosh(const TToken<CSwooshDescription>& desc, int len
|
|||
x19c_p3.resize(x1b8_SIDE);
|
||||
|
||||
if (x1c_desc->x44_29_WIRE) {
|
||||
int maxVerts = x1b4_LENG * (x1b0_SPLN + 1) * x1b8_SIDE * 12;
|
||||
const int maxVerts = x1b4_LENG * (x1b0_SPLN + 1) * x1b8_SIDE * 12;
|
||||
m_lineRenderer.reset(
|
||||
new CLineRenderer(CLineRenderer::EPrimitiveMode::Lines, maxVerts * 2, nullptr, x1d0_25_AALP));
|
||||
} else {
|
||||
int maxVerts = x1b4_LENG * (x1b0_SPLN + 1) * x1b8_SIDE * 4;
|
||||
const auto maxVerts = size_t(x1b4_LENG * (x1b0_SPLN + 1) * x1b8_SIDE * 4);
|
||||
m_cachedVerts.reserve(maxVerts);
|
||||
CGraphics::CommitResources([&](boo::IGraphicsDataFactory::Context& ctx) {
|
||||
m_vertBuf = ctx.newDynamicBuffer(boo::BufferUse::Vertex, sizeof(CParticleSwooshShaders::Vert), maxVerts);
|
||||
|
|
@ -134,15 +138,17 @@ void CParticleSwoosh::UpdateTranslationAndOrientation() {
|
|||
swoosh.x68_frame = x28_curFrame - swoosh.x70_startFrame;
|
||||
CParticleGlobals::instance()->UpdateParticleLifetimeTweenValues(swoosh.x68_frame);
|
||||
if (x1c_desc->x44_28_SROT) {
|
||||
if (CRealElement* irot = x1c_desc->x1c_IROT.get())
|
||||
if (CRealElement* irot = x1c_desc->x1c_IROT.get()) {
|
||||
irot->GetValue(x28_curFrame, swoosh.x30_irot);
|
||||
}
|
||||
swoosh.x34_rotm = 0.f;
|
||||
} else {
|
||||
if (CRealElement* rotm = x1c_desc->x20_ROTM.get())
|
||||
if (CRealElement* rotm = x1c_desc->x20_ROTM.get()) {
|
||||
rotm->GetValue(x28_curFrame, swoosh.x34_rotm);
|
||||
else
|
||||
} else {
|
||||
swoosh.x34_rotm = 0.f;
|
||||
}
|
||||
}
|
||||
|
||||
if (CModVectorElement* velm = x1c_desc->x30_VELM.get()) {
|
||||
if (x1d0_29_VLS1) {
|
||||
|
|
@ -197,8 +203,9 @@ void CParticleSwoosh::UpdateTranslationAndOrientation() {
|
|||
}
|
||||
|
||||
bool CParticleSwoosh::Update(double dt) {
|
||||
if (!IsValid())
|
||||
if (!IsValid()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
CParticleGlobals::instance()->SetParticleLifetime(x1b4_LENG);
|
||||
CParticleGlobals::instance()->SetEmitterTime(x28_curFrame);
|
||||
|
|
@ -207,24 +214,27 @@ bool CParticleSwoosh::Update(double dt) {
|
|||
|
||||
double evalTime = x28_curFrame / 60.0;
|
||||
float time = 1.f;
|
||||
if (CRealElement* timeElem = x1c_desc->x4_TIME.get())
|
||||
if (CRealElement* timeElem = x1c_desc->x4_TIME.get()) {
|
||||
timeElem->GetValue(x28_curFrame, time);
|
||||
}
|
||||
|
||||
x30_curTime += std::max(0.0, dt * time);
|
||||
while (x1d0_26_forceOneUpdate || evalTime < x30_curTime) {
|
||||
x1d0_26_forceOneUpdate = false;
|
||||
|
||||
x158_curParticle += 1;
|
||||
if (x158_curParticle >= x15c_swooshes.size())
|
||||
if (x158_curParticle >= x15c_swooshes.size()) {
|
||||
x158_curParticle = 0;
|
||||
}
|
||||
|
||||
if (x1d0_24_emitting && x28_curFrame < x2c_PSLT) {
|
||||
UpdateSwooshTranslation(x38_translation);
|
||||
|
||||
if (CRealElement* irot = x1c_desc->x1c_IROT.get())
|
||||
if (CRealElement* irot = x1c_desc->x1c_IROT.get()) {
|
||||
irot->GetValue(x28_curFrame, x15c_swooshes[x158_curParticle].x30_irot);
|
||||
else
|
||||
} else {
|
||||
x15c_swooshes[x158_curParticle].x30_irot = 0.f;
|
||||
}
|
||||
|
||||
x15c_swooshes[x158_curParticle].x34_rotm = 0.f;
|
||||
x15c_swooshes[x158_curParticle].x70_startFrame = x28_curFrame;
|
||||
|
|
@ -241,20 +251,23 @@ bool CParticleSwoosh::Update(double dt) {
|
|||
x15c_swooshes[x158_curParticle].x74_velocity = x44_orientation * x15c_swooshes[x158_curParticle].x74_velocity;
|
||||
}
|
||||
|
||||
if (CVectorElement* pofs = x1c_desc->x24_POFS.get())
|
||||
if (CVectorElement* pofs = x1c_desc->x24_POFS.get()) {
|
||||
pofs->GetValue(x28_curFrame, x15c_swooshes[x158_curParticle].x18_offset);
|
||||
}
|
||||
|
||||
x15c_swooshes[x158_curParticle].x24_useOffset = x15c_swooshes[x158_curParticle].x18_offset;
|
||||
|
||||
if (CColorElement* colr = x1c_desc->x14_COLR.get())
|
||||
if (CColorElement* colr = x1c_desc->x14_COLR.get()) {
|
||||
colr->GetValue(x28_curFrame, x15c_swooshes[x158_curParticle].x6c_color);
|
||||
else
|
||||
} else {
|
||||
x15c_swooshes[x158_curParticle].x6c_color = zeus::skWhite;
|
||||
}
|
||||
|
||||
int tspn = 0;
|
||||
if (CIntElement* tspnElem = x1c_desc->x40_TSPN.get())
|
||||
if (CIntElement* tspnElem = x1c_desc->x40_TSPN.get()) {
|
||||
tspnElem->GetValue(x28_curFrame, tspn);
|
||||
x1cc_TSPN = tspn;
|
||||
}
|
||||
x1cc_TSPN = float(tspn);
|
||||
} else if (x15c_swooshes[x158_curParticle].x0_active) {
|
||||
x1ac_particleCount = std::max(0, int(x1ac_particleCount) - 1);
|
||||
x15c_swooshes[x158_curParticle].x0_active = false;
|
||||
|
|
@ -271,28 +284,32 @@ bool CParticleSwoosh::Update(double dt) {
|
|||
|
||||
zeus::CVector3f CParticleSwoosh::GetSplinePoint(const zeus::CVector3f& p0, const zeus::CVector3f& p1,
|
||||
const zeus::CVector3f& p2, const zeus::CVector3f& p3, float t) {
|
||||
if (t > 0.f)
|
||||
if (t > 0.f) {
|
||||
return p1;
|
||||
if (t >= 1.f)
|
||||
}
|
||||
if (t >= 1.f) {
|
||||
return p2;
|
||||
}
|
||||
|
||||
// Tricubic spline interpolation
|
||||
float t2 = t * t;
|
||||
float t3 = t2 * t;
|
||||
const float t2 = t * t;
|
||||
const float t3 = t2 * t;
|
||||
|
||||
float p0Coef = -0.5f * t3 + t2 - 0.5f * t;
|
||||
float p1Coef = 1.5f * t3 - 2.5f * t2 + 1.f;
|
||||
float p2Coef = -1.5f * t3 + 2.f * t2 + 0.5f * t;
|
||||
float p3Coef = 0.5f * t3 + 0.5f * t2;
|
||||
const float p0Coef = -0.5f * t3 + t2 - 0.5f * t;
|
||||
const float p1Coef = 1.5f * t3 - 2.5f * t2 + 1.f;
|
||||
const float p2Coef = -1.5f * t3 + 2.f * t2 + 0.5f * t;
|
||||
const float p3Coef = 0.5f * t3 + 0.5f * t2;
|
||||
|
||||
return p0 * p0Coef + p1 * p1Coef + p2 * p2Coef + p3 * p3Coef;
|
||||
}
|
||||
|
||||
int CParticleSwoosh::WrapIndex(int i) const {
|
||||
while (i < 0)
|
||||
while (i < 0) {
|
||||
i += x1b4_LENG;
|
||||
while (i >= x1b4_LENG)
|
||||
}
|
||||
while (i >= x1b4_LENG) {
|
||||
i -= x1b4_LENG;
|
||||
}
|
||||
return i;
|
||||
}
|
||||
|
||||
|
|
@ -305,112 +322,125 @@ void CParticleSwoosh::RenderNSidedSpline() {
|
|||
}
|
||||
|
||||
bool cros = x1c_desc->x44_25_CROS;
|
||||
if (x1b8_SIDE >= 4 || x1b8_SIDE & 0x1)
|
||||
if (x1b8_SIDE >= 4 || (x1b8_SIDE & 0x1) != 0) {
|
||||
cros = false;
|
||||
}
|
||||
|
||||
int curIdx = x158_curParticle;
|
||||
for (size_t i = 0; i < x15c_swooshes.size(); ++i) {
|
||||
bool a0 = x15c_swooshes[WrapIndex(curIdx - 1)].x0_active;
|
||||
bool a1 = x15c_swooshes[WrapIndex(curIdx)].x0_active;
|
||||
const bool a0 = x15c_swooshes[WrapIndex(curIdx - 1)].x0_active;
|
||||
const bool a1 = x15c_swooshes[WrapIndex(curIdx)].x0_active;
|
||||
if (!a1 || (a1 && !a0)) {
|
||||
curIdx -= 1;
|
||||
if (curIdx < 0)
|
||||
if (curIdx < 0) {
|
||||
curIdx = x15c_swooshes.size() - 1;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
SSwooshData& refSwoosh = x15c_swooshes[curIdx];
|
||||
const SSwooshData& refSwoosh = x15c_swooshes[curIdx];
|
||||
|
||||
float sideDiv = 360.f / float(x1b8_SIDE);
|
||||
const float sideDiv = 360.f / float(x1b8_SIDE);
|
||||
for (int j = 0; j < 4; ++j) {
|
||||
int crossRefIdx = 0;
|
||||
if (j == 0) {
|
||||
crossRefIdx = WrapIndex(curIdx + 1);
|
||||
if (!x15c_swooshes[crossRefIdx].x0_active)
|
||||
if (!x15c_swooshes[crossRefIdx].x0_active) {
|
||||
crossRefIdx = curIdx;
|
||||
}
|
||||
} else if (j == 1) {
|
||||
crossRefIdx = WrapIndex(curIdx);
|
||||
} else if (j == 2) {
|
||||
crossRefIdx = WrapIndex(curIdx - 1);
|
||||
} else if (j == 3) {
|
||||
crossRefIdx = WrapIndex(curIdx - 2);
|
||||
if (!x15c_swooshes[crossRefIdx].x0_active)
|
||||
if (!x15c_swooshes[crossRefIdx].x0_active) {
|
||||
crossRefIdx = WrapIndex(curIdx - 1);
|
||||
}
|
||||
}
|
||||
|
||||
if (x1b4_LENG == 2) {
|
||||
if (j == 0)
|
||||
if (j == 0) {
|
||||
crossRefIdx = WrapIndex(curIdx);
|
||||
if (j == 3)
|
||||
}
|
||||
if (j == 3) {
|
||||
crossRefIdx = WrapIndex(curIdx - 1);
|
||||
}
|
||||
} else if (x158_curParticle == curIdx && j == 0) {
|
||||
crossRefIdx = x158_curParticle;
|
||||
} else {
|
||||
if (WrapIndex(x158_curParticle + 2) == curIdx && j == 3)
|
||||
if (WrapIndex(x158_curParticle + 2) == curIdx && j == 3) {
|
||||
crossRefIdx = WrapIndex(x158_curParticle + 1);
|
||||
else if (x1ac_particleCount - 2 == i && j == 3)
|
||||
} else if (x1ac_particleCount - 2 == i && j == 3) {
|
||||
crossRefIdx = 0;
|
||||
}
|
||||
}
|
||||
|
||||
SSwooshData& crossSwoosh = x15c_swooshes[crossRefIdx];
|
||||
const SSwooshData& crossSwoosh = x15c_swooshes[crossRefIdx];
|
||||
for (int k = 0; k < x1b8_SIDE; ++k) {
|
||||
float n = sideDiv * k;
|
||||
const float n = sideDiv * k;
|
||||
float ang = zeus::degToRad(n + crossSwoosh.x30_irot + crossSwoosh.x34_rotm);
|
||||
if (std::fabs(ang) > M_PIF) {
|
||||
ang -= std::floor(ang / (2.f * M_PIF)) * 2.f * M_PIF;
|
||||
if (ang > M_PIF)
|
||||
if (ang > M_PIF) {
|
||||
ang -= 2.f * M_PIF;
|
||||
else if (ang < -M_PIF)
|
||||
} else if (ang < -M_PIF) {
|
||||
ang += 2.f * M_PIF;
|
||||
}
|
||||
}
|
||||
|
||||
float z = std::sin(ang);
|
||||
float x = std::cos(ang);
|
||||
const float z = std::sin(ang);
|
||||
const float x = std::cos(ang);
|
||||
|
||||
float rad = (n > 0.f && n <= 180.f) ? crossSwoosh.x4_leftRad : crossSwoosh.x8_rightRad;
|
||||
zeus::CVector3f offset = crossSwoosh.xc_translation + crossSwoosh.x24_useOffset;
|
||||
const float rad = (n > 0.f && n <= 180.f) ? crossSwoosh.x4_leftRad : crossSwoosh.x8_rightRad;
|
||||
const zeus::CVector3f offset = crossSwoosh.xc_translation + crossSwoosh.x24_useOffset;
|
||||
|
||||
if (j == 0)
|
||||
if (j == 0) {
|
||||
x16c_p0[k] = crossSwoosh.x38_orientation * zeus::CVector3f(rad * x, 0.f, rad * z) + offset;
|
||||
else if (j == 1)
|
||||
} else if (j == 1) {
|
||||
x17c_p1[k] = crossSwoosh.x38_orientation * zeus::CVector3f(rad * x, 0.f, rad * z) + offset;
|
||||
else if (j == 2)
|
||||
} else if (j == 2) {
|
||||
x18c_p2[k] = crossSwoosh.x38_orientation * zeus::CVector3f(rad * x, 0.f, rad * z) + offset;
|
||||
else if (j == 3)
|
||||
} else if (j == 3) {
|
||||
x19c_p3[k] = crossSwoosh.x38_orientation * zeus::CVector3f(rad * x, 0.f, rad * z) + offset;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (x1c_desc->x3c_TEXR) {
|
||||
if (x1ec_TSPN > 0)
|
||||
if (x1ec_TSPN > 0) {
|
||||
x1d4_uvs.xMin = float((i % x1ec_TSPN) * x1e8_uvSpan);
|
||||
else
|
||||
} else {
|
||||
x1d4_uvs.xMin = float(i * x1e8_uvSpan);
|
||||
}
|
||||
}
|
||||
|
||||
float segUvSpan = x1e8_uvSpan / float(x1b0_SPLN + 1);
|
||||
const float segUvSpan = x1e8_uvSpan / float(x1b0_SPLN + 1);
|
||||
for (int j = 0; j < x1b0_SPLN + 1; ++j) {
|
||||
float t0 = j / float(x1b0_SPLN + 1);
|
||||
float t1 = (j + 1) / float(x1b0_SPLN + 1);
|
||||
const float t0 = j / float(x1b0_SPLN + 1);
|
||||
const float t1 = (j + 1) / float(x1b0_SPLN + 1);
|
||||
int faces = x1b8_SIDE;
|
||||
if (x1b8_SIDE <= 2)
|
||||
if (x1b8_SIDE <= 2) {
|
||||
faces = 1;
|
||||
else if (cros)
|
||||
} else if (cros) {
|
||||
faces = x1b8_SIDE / 2;
|
||||
}
|
||||
|
||||
x1d4_uvs.xMax = x1d4_uvs.xMin + segUvSpan;
|
||||
|
||||
for (int k = 0; k < faces; ++k) {
|
||||
int otherK = k + 1;
|
||||
if (k + 1 >= x1b8_SIDE)
|
||||
if (k + 1 >= x1b8_SIDE) {
|
||||
otherK = 0;
|
||||
zeus::CColor color = refSwoosh.x6c_color * x20c_moduColor;
|
||||
}
|
||||
|
||||
const zeus::CColor color = refSwoosh.x6c_color * x20c_moduColor;
|
||||
if (cros) {
|
||||
otherK = k + x1b8_SIDE / 2;
|
||||
zeus::CVector3f v0 = GetSplinePoint(x16c_p0[k], x17c_p1[k], x18c_p2[k], x19c_p3[k], t0);
|
||||
zeus::CVector3f v1 = GetSplinePoint(x16c_p0[otherK], x17c_p1[otherK], x18c_p2[otherK], x19c_p3[otherK], t0);
|
||||
zeus::CVector3f v2 = GetSplinePoint(x16c_p0[otherK], x17c_p1[otherK], x18c_p2[otherK], x19c_p3[otherK], t1);
|
||||
zeus::CVector3f v3 = GetSplinePoint(x16c_p0[k], x17c_p1[k], x18c_p2[k], x19c_p3[k], t1);
|
||||
const auto v0 = GetSplinePoint(x16c_p0[k], x17c_p1[k], x18c_p2[k], x19c_p3[k], t0);
|
||||
const auto v1 = GetSplinePoint(x16c_p0[otherK], x17c_p1[otherK], x18c_p2[otherK], x19c_p3[otherK], t0);
|
||||
const auto v2 = GetSplinePoint(x16c_p0[otherK], x17c_p1[otherK], x18c_p2[otherK], x19c_p3[otherK], t1);
|
||||
const auto v3 = GetSplinePoint(x16c_p0[k], x17c_p1[k], x18c_p2[k], x19c_p3[k], t1);
|
||||
|
||||
m_cachedVerts.push_back({v0, {x1d4_uvs.xMin, x1d4_uvs.yMin}, color});
|
||||
m_cachedVerts.push_back({v1, {x1d4_uvs.xMin, x1d4_uvs.yMax}, color});
|
||||
|
|
@ -418,10 +448,10 @@ void CParticleSwoosh::RenderNSidedSpline() {
|
|||
m_cachedVerts.push_back({v3, {x1d4_uvs.xMax, x1d4_uvs.yMax}, color});
|
||||
CGraphics::DrawArray(m_cachedVerts.size() - 4, 4);
|
||||
} else {
|
||||
zeus::CVector3f v0 = GetSplinePoint(x16c_p0[k], x17c_p1[k], x18c_p2[k], x19c_p3[k], t0);
|
||||
zeus::CVector3f v1 = GetSplinePoint(x16c_p0[otherK], x17c_p1[otherK], x18c_p2[otherK], x19c_p3[otherK], t0);
|
||||
zeus::CVector3f v2 = GetSplinePoint(x16c_p0[otherK], x17c_p1[otherK], x18c_p2[otherK], x19c_p3[otherK], t1);
|
||||
zeus::CVector3f v3 = GetSplinePoint(x16c_p0[k], x17c_p1[k], x18c_p2[k], x19c_p3[k], t1);
|
||||
const auto v0 = GetSplinePoint(x16c_p0[k], x17c_p1[k], x18c_p2[k], x19c_p3[k], t0);
|
||||
const auto v1 = GetSplinePoint(x16c_p0[otherK], x17c_p1[otherK], x18c_p2[otherK], x19c_p3[otherK], t0);
|
||||
const auto v2 = GetSplinePoint(x16c_p0[otherK], x17c_p1[otherK], x18c_p2[otherK], x19c_p3[otherK], t1);
|
||||
const auto v3 = GetSplinePoint(x16c_p0[k], x17c_p1[k], x18c_p2[k], x19c_p3[k], t1);
|
||||
|
||||
if (x1bc_prim == GX::LINES) {
|
||||
m_lineRenderer->AddVertex(v0, color, 1.f);
|
||||
|
|
@ -446,57 +476,65 @@ void CParticleSwoosh::RenderNSidedSpline() {
|
|||
}
|
||||
}
|
||||
|
||||
if (x1c_desc->x3c_TEXR && x1b0_SPLN > 0)
|
||||
if (x1c_desc->x3c_TEXR && x1b0_SPLN > 0) {
|
||||
x1d4_uvs.xMin += segUvSpan;
|
||||
}
|
||||
}
|
||||
|
||||
curIdx -= 1;
|
||||
if (curIdx < 0)
|
||||
if (curIdx < 0) {
|
||||
curIdx = x15c_swooshes.size() - 1;
|
||||
}
|
||||
}
|
||||
|
||||
if (x1bc_prim == GX::LINES)
|
||||
if (x1bc_prim == GX::LINES) {
|
||||
m_lineRenderer->Render(g_Renderer->IsThermalVisorHotPass());
|
||||
}
|
||||
}
|
||||
|
||||
void CParticleSwoosh::RenderNSidedNoSpline() { RenderNSidedSpline(); }
|
||||
|
||||
void CParticleSwoosh::Render3SidedSolidSpline() {
|
||||
if (x15c_swooshes.size() < 2)
|
||||
if (x15c_swooshes.size() < 2) {
|
||||
return;
|
||||
}
|
||||
|
||||
int curIdx = x158_curParticle;
|
||||
float curUvSpan = -x1e8_uvSpan;
|
||||
zeus::CColor prevColor0 = zeus::skClear;
|
||||
for (size_t i = 0; i < x15c_swooshes.size(); ++i) {
|
||||
SSwooshData& swoosh = x15c_swooshes[curIdx];
|
||||
const SSwooshData& swoosh = x15c_swooshes[curIdx];
|
||||
|
||||
curIdx -= 1;
|
||||
if (curIdx < 0)
|
||||
if (curIdx < 0) {
|
||||
curIdx = x15c_swooshes.size() - 1;
|
||||
}
|
||||
|
||||
float ang1 = zeus::degToRad(swoosh.x30_irot + swoosh.x34_rotm);
|
||||
if (std::fabs(ang1) > M_PIF) {
|
||||
ang1 -= std::floor(ang1 / (2.f * M_PIF)) * 2.f * M_PIF;
|
||||
if (ang1 > M_PIF)
|
||||
if (ang1 > M_PIF) {
|
||||
ang1 -= 2.f * M_PIF;
|
||||
else if (ang1 < -M_PIF)
|
||||
} else if (ang1 < -M_PIF) {
|
||||
ang1 += 2.f * M_PIF;
|
||||
}
|
||||
}
|
||||
|
||||
zeus::CVector3f ang1Vec(std::sin(ang1) * swoosh.x4_leftRad, 0.f, std::cos(ang1) * swoosh.x4_leftRad);
|
||||
const zeus::CVector3f ang1Vec(std::sin(ang1) * swoosh.x4_leftRad, 0.f, std::cos(ang1) * swoosh.x4_leftRad);
|
||||
|
||||
float ang2 = ang1 + 2.0943952f; // +120 degrees
|
||||
if (ang2 > M_PIF)
|
||||
if (ang2 > M_PIF) {
|
||||
ang2 -= 2.f * M_PIF;
|
||||
}
|
||||
|
||||
zeus::CVector3f ang2Vec(std::sin(ang2) * swoosh.x4_leftRad, 0.f, std::cos(ang2) * swoosh.x4_leftRad);
|
||||
const zeus::CVector3f ang2Vec(std::sin(ang2) * swoosh.x4_leftRad, 0.f, std::cos(ang2) * swoosh.x4_leftRad);
|
||||
|
||||
float ang3 = ang2 + 2.0943952f; // +120 degrees
|
||||
if (ang3 > M_PIF)
|
||||
if (ang3 > M_PIF) {
|
||||
ang3 -= 2.f * M_PIF;
|
||||
}
|
||||
|
||||
zeus::CVector3f ang3Vec(std::sin(ang3) * swoosh.x4_leftRad, 0.f, std::cos(ang3) * swoosh.x4_leftRad);
|
||||
const zeus::CVector3f ang3Vec(std::sin(ang3) * swoosh.x4_leftRad, 0.f, std::cos(ang3) * swoosh.x4_leftRad);
|
||||
|
||||
if (i == 2) {
|
||||
x19c_p3[0] = x17c_p1[0] * 2.f - x16c_p0[0];
|
||||
|
|
@ -516,15 +554,15 @@ void CParticleSwoosh::Render3SidedSolidSpline() {
|
|||
x17c_p1[1] = x16c_p0[1];
|
||||
x17c_p1[2] = x16c_p0[2];
|
||||
|
||||
zeus::CVector3f useOffset = swoosh.xc_translation + swoosh.x24_useOffset;
|
||||
const zeus::CVector3f useOffset = swoosh.xc_translation + swoosh.x24_useOffset;
|
||||
x16c_p0[0] = swoosh.x38_orientation * ang1Vec + useOffset;
|
||||
x16c_p0[1] = swoosh.x38_orientation * ang2Vec + useOffset;
|
||||
x16c_p0[2] = swoosh.x38_orientation * ang3Vec + useOffset;
|
||||
|
||||
zeus::CColor useColor0 = prevColor0;
|
||||
const zeus::CColor useColor0 = prevColor0;
|
||||
|
||||
if (swoosh.x0_active) {
|
||||
zeus::CColor prevColor1 = prevColor0;
|
||||
const zeus::CColor prevColor1 = prevColor0;
|
||||
prevColor0 = swoosh.x6c_color * x20c_moduColor;
|
||||
float prevUvSpan = curUvSpan;
|
||||
curUvSpan += x1e8_uvSpan;
|
||||
|
|
@ -584,8 +622,9 @@ void CParticleSwoosh::Render3SidedSolidSpline() {
|
|||
}
|
||||
|
||||
void CParticleSwoosh::Render3SidedSolidNoSplineNoGaps() {
|
||||
if (x15c_swooshes.size() < 2)
|
||||
if (x15c_swooshes.size() < 2) {
|
||||
return;
|
||||
}
|
||||
|
||||
std::array<zeus::CVector3f, 2> p0;
|
||||
std::array<zeus::CVector3f, 2> p1;
|
||||
|
|
@ -596,36 +635,40 @@ void CParticleSwoosh::Render3SidedSolidNoSplineNoGaps() {
|
|||
zeus::CColor c0 = zeus::skClear;
|
||||
float uv0 = -x1e8_uvSpan;
|
||||
for (size_t i = 0; i < x15c_swooshes.size(); ++i) {
|
||||
SSwooshData& swoosh = x15c_swooshes[curIdx];
|
||||
const SSwooshData& swoosh = x15c_swooshes[curIdx];
|
||||
|
||||
curIdx -= 1;
|
||||
if (curIdx < 0)
|
||||
if (curIdx < 0) {
|
||||
curIdx = x15c_swooshes.size() - 1;
|
||||
}
|
||||
|
||||
float ang1 = zeus::degToRad(swoosh.x30_irot + swoosh.x34_rotm);
|
||||
if (std::fabs(ang1) > M_PIF) {
|
||||
ang1 -= std::floor(ang1 / (2.f * M_PIF)) * 2.f * M_PIF;
|
||||
if (ang1 > M_PIF)
|
||||
if (ang1 > M_PIF) {
|
||||
ang1 -= 2.f * M_PIF;
|
||||
else if (ang1 < -M_PIF)
|
||||
} else if (ang1 < -M_PIF) {
|
||||
ang1 += 2.f * M_PIF;
|
||||
}
|
||||
}
|
||||
|
||||
zeus::CVector3f ang1Vec(std::sin(ang1) * swoosh.x4_leftRad, 0.f, std::cos(ang1) * swoosh.x4_leftRad);
|
||||
const zeus::CVector3f ang1Vec(std::sin(ang1) * swoosh.x4_leftRad, 0.f, std::cos(ang1) * swoosh.x4_leftRad);
|
||||
|
||||
float ang2 = ang1 + 2.0943952f; // +120 degrees
|
||||
if (ang2 > M_PIF)
|
||||
if (ang2 > M_PIF) {
|
||||
ang2 -= 2.f * M_PIF;
|
||||
}
|
||||
|
||||
zeus::CVector3f ang2Vec(std::sin(ang2) * swoosh.x4_leftRad, 0.f, std::cos(ang2) * swoosh.x4_leftRad);
|
||||
const zeus::CVector3f ang2Vec(std::sin(ang2) * swoosh.x4_leftRad, 0.f, std::cos(ang2) * swoosh.x4_leftRad);
|
||||
|
||||
float ang3 = ang2 + 2.0943952f; // +120 degrees
|
||||
if (ang3 > M_PIF)
|
||||
if (ang3 > M_PIF) {
|
||||
ang3 -= 2.f * M_PIF;
|
||||
}
|
||||
|
||||
zeus::CVector3f ang3Vec(std::sin(ang3) * swoosh.x4_leftRad, 0.f, std::cos(ang3) * swoosh.x4_leftRad);
|
||||
const zeus::CVector3f ang3Vec(std::sin(ang3) * swoosh.x4_leftRad, 0.f, std::cos(ang3) * swoosh.x4_leftRad);
|
||||
|
||||
zeus::CVector3f useOffset = swoosh.xc_translation + swoosh.x24_useOffset;
|
||||
const zeus::CVector3f useOffset = swoosh.xc_translation + swoosh.x24_useOffset;
|
||||
p0[i & 1] = swoosh.x38_orientation * ang1Vec + useOffset;
|
||||
p1[i & 1] = swoosh.x38_orientation * ang2Vec + useOffset;
|
||||
p2[i & 1] = swoosh.x38_orientation * ang3Vec + useOffset;
|
||||
|
|
@ -641,10 +684,10 @@ void CParticleSwoosh::Render3SidedSolidNoSplineNoGaps() {
|
|||
}
|
||||
|
||||
lastActive = true;
|
||||
zeus::CColor c1 = c0;
|
||||
const zeus::CColor c1 = c0;
|
||||
c0 = swoosh.x6c_color * x20c_moduColor;
|
||||
|
||||
float uv1 = uv0;
|
||||
const float uv1 = uv0;
|
||||
uv0 += x1e8_uvSpan;
|
||||
|
||||
m_cachedVerts.push_back({p0[i & 1], {uv0, x1d4_uvs.yMin}, c0});
|
||||
|
|
@ -674,12 +717,13 @@ void CParticleSwoosh::Render2SidedNoSplineGaps() {
|
|||
bool streaming = false;
|
||||
int curIdx = x158_curParticle;
|
||||
for (size_t i = 0; i < x15c_swooshes.size(); ++i) {
|
||||
SSwooshData& swoosh = x15c_swooshes[curIdx];
|
||||
bool otherActive = x15c_swooshes[WrapIndex(curIdx - 1)].x0_active;
|
||||
const SSwooshData& swoosh = x15c_swooshes[curIdx];
|
||||
const bool otherActive = x15c_swooshes[WrapIndex(curIdx - 1)].x0_active;
|
||||
|
||||
curIdx -= 1;
|
||||
if (curIdx < 0)
|
||||
if (curIdx < 0) {
|
||||
curIdx = x15c_swooshes.size() - 2;
|
||||
}
|
||||
|
||||
if (!swoosh.x0_active) {
|
||||
if (streaming) {
|
||||
|
|
@ -690,10 +734,12 @@ void CParticleSwoosh::Render2SidedNoSplineGaps() {
|
|||
}
|
||||
|
||||
if (!streaming) {
|
||||
if (!otherActive)
|
||||
if (!otherActive) {
|
||||
continue;
|
||||
if (i >= x15c_swooshes.size() - 2)
|
||||
}
|
||||
if (i >= x15c_swooshes.size() - 2) {
|
||||
continue;
|
||||
}
|
||||
streaming = true;
|
||||
drawStart = m_cachedVerts.size();
|
||||
}
|
||||
|
|
@ -701,24 +747,25 @@ void CParticleSwoosh::Render2SidedNoSplineGaps() {
|
|||
float ang = zeus::degToRad(swoosh.x30_irot + swoosh.x34_rotm);
|
||||
if (std::fabs(ang) > M_PIF) {
|
||||
ang -= std::floor(ang / (2.f * M_PIF)) * 2.f * M_PIF;
|
||||
if (ang > M_PIF)
|
||||
if (ang > M_PIF) {
|
||||
ang -= 2.f * M_PIF;
|
||||
else if (ang < -M_PIF)
|
||||
} else if (ang < -M_PIF) {
|
||||
ang += 2.f * M_PIF;
|
||||
}
|
||||
}
|
||||
|
||||
float sinAng = std::sin(ang);
|
||||
float cosAng = std::cos(ang);
|
||||
const float sinAng = std::sin(ang);
|
||||
const float cosAng = std::cos(ang);
|
||||
|
||||
zeus::CVector3f useOffset = swoosh.xc_translation + swoosh.x24_useOffset;
|
||||
zeus::CVector3f v0 =
|
||||
const zeus::CVector3f useOffset = swoosh.xc_translation + swoosh.x24_useOffset;
|
||||
const zeus::CVector3f v0 =
|
||||
swoosh.x38_orientation * zeus::CVector3f(cosAng * swoosh.x4_leftRad, 0.f, sinAng * swoosh.x4_leftRad) +
|
||||
useOffset;
|
||||
zeus::CVector3f v1 =
|
||||
const zeus::CVector3f v1 =
|
||||
swoosh.x38_orientation * zeus::CVector3f(-cosAng * swoosh.x8_rightRad, 0.f, -sinAng * swoosh.x8_rightRad) +
|
||||
useOffset;
|
||||
|
||||
zeus::CColor color = swoosh.x6c_color * x20c_moduColor;
|
||||
const zeus::CColor color = swoosh.x6c_color * x20c_moduColor;
|
||||
|
||||
m_cachedVerts.push_back({v0, {1.f, x1d4_uvs.yMin}, color});
|
||||
m_cachedVerts.push_back({v1, {1.f, x1d4_uvs.yMax}, color});
|
||||
|
|
@ -735,43 +782,47 @@ void CParticleSwoosh::Render2SidedNoSplineNoGaps() {
|
|||
int curIdx = x158_curParticle;
|
||||
int particleCount = x1ac_particleCount;
|
||||
float uvOffset = 0.f;
|
||||
|
||||
if (x1c_desc->x3c_TEXR) {
|
||||
if (x1c_desc->x45_25_ORNT) {
|
||||
zeus::CVector3f camToParticle =
|
||||
const zeus::CVector3f camToParticle =
|
||||
((zeus::CTransform::Translate(xa4_globalTranslation) * xb0_globalOrientation * xec_scaleXf).inverse() *
|
||||
CGraphics::g_ViewMatrix)
|
||||
.origin;
|
||||
zeus::CVector3f dotVec = zeus::skZero3f;
|
||||
|
||||
for (size_t i = 0; i < x15c_swooshes.size(); ++i) {
|
||||
SSwooshData& swoosh = x15c_swooshes[curIdx];
|
||||
const SSwooshData& swoosh = x15c_swooshes[curIdx];
|
||||
|
||||
curIdx -= 1;
|
||||
if (curIdx < 0)
|
||||
if (curIdx < 0) {
|
||||
curIdx = x15c_swooshes.size() - 1;
|
||||
}
|
||||
|
||||
if (swoosh.x0_active) {
|
||||
particleCount -= 1;
|
||||
int otherIdx = curIdx - 1;
|
||||
if (otherIdx < 0)
|
||||
if (otherIdx < 0) {
|
||||
otherIdx = x15c_swooshes.size() - 1;
|
||||
}
|
||||
|
||||
SSwooshData& otherSwoosh = x15c_swooshes[otherIdx];
|
||||
const SSwooshData& otherSwoosh = x15c_swooshes[otherIdx];
|
||||
|
||||
zeus::CVector3f delta = otherSwoosh.xc_translation - swoosh.xc_translation;
|
||||
if (otherIdx == x158_curParticle)
|
||||
if (otherIdx == x158_curParticle) {
|
||||
delta = swoosh.xc_translation - x15c_swooshes[(curIdx + 1) % x15c_swooshes.size()].xc_translation;
|
||||
}
|
||||
|
||||
if (delta.canBeNormalized()) {
|
||||
zeus::CVector3f deltaCross = delta.cross(camToParticle - swoosh.xc_translation);
|
||||
if (deltaCross.canBeNormalized()) {
|
||||
deltaCross.normalize();
|
||||
dotVec = (deltaCross.dot(dotVec) < 0.f ? -1.f : 1.f) * deltaCross;
|
||||
zeus::CVector3f useOffset = swoosh.xc_translation + swoosh.x24_useOffset;
|
||||
zeus::CVector3f v0 = dotVec * swoosh.x4_leftRad + useOffset;
|
||||
zeus::CVector3f v1 = dotVec * -swoosh.x8_rightRad + useOffset;
|
||||
const zeus::CVector3f useOffset = swoosh.xc_translation + swoosh.x24_useOffset;
|
||||
const zeus::CVector3f v0 = dotVec * swoosh.x4_leftRad + useOffset;
|
||||
const zeus::CVector3f v1 = dotVec * -swoosh.x8_rightRad + useOffset;
|
||||
|
||||
zeus::CColor color = swoosh.x6c_color * x20c_moduColor;
|
||||
const zeus::CColor color = swoosh.x6c_color * x20c_moduColor;
|
||||
|
||||
m_cachedVerts.push_back({v0, {uvOffset, x1d4_uvs.yMin}, color});
|
||||
m_cachedVerts.push_back({v1, {uvOffset, x1d4_uvs.yMax}, color});
|
||||
|
|
@ -783,21 +834,23 @@ void CParticleSwoosh::Render2SidedNoSplineNoGaps() {
|
|||
m_cachedVerts.push_back({v1, {uvOffset, x1d4_uvs.yMax}, color});
|
||||
}
|
||||
|
||||
if (x1ec_TSPN > 0)
|
||||
if (x1ec_TSPN > 0) {
|
||||
uvOffset += x1e8_uvSpan;
|
||||
else
|
||||
} else {
|
||||
uvOffset = float(i * x1e8_uvSpan);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
for (size_t i = 0; i < x15c_swooshes.size(); ++i) {
|
||||
SSwooshData& swoosh = x15c_swooshes[curIdx];
|
||||
const SSwooshData& swoosh = x15c_swooshes[curIdx];
|
||||
|
||||
curIdx -= 1;
|
||||
if (curIdx < 0)
|
||||
if (curIdx < 0) {
|
||||
curIdx = x15c_swooshes.size() - 1;
|
||||
}
|
||||
|
||||
if (swoosh.x0_active) {
|
||||
particleCount -= 1;
|
||||
|
|
@ -805,24 +858,25 @@ void CParticleSwoosh::Render2SidedNoSplineNoGaps() {
|
|||
float ang = zeus::degToRad(swoosh.x30_irot + swoosh.x34_rotm);
|
||||
if (std::fabs(ang) > M_PIF) {
|
||||
ang -= std::floor(ang / (2.f * M_PIF)) * 2.f * M_PIF;
|
||||
if (ang > M_PIF)
|
||||
if (ang > M_PIF) {
|
||||
ang -= 2.f * M_PIF;
|
||||
else if (ang < -M_PIF)
|
||||
} else if (ang < -M_PIF) {
|
||||
ang += 2.f * M_PIF;
|
||||
}
|
||||
}
|
||||
|
||||
float sinAng = std::sin(ang);
|
||||
float cosAng = std::cos(ang);
|
||||
|
||||
zeus::CVector3f useOffset = swoosh.xc_translation + swoosh.x24_useOffset;
|
||||
zeus::CVector3f v0 =
|
||||
const zeus::CVector3f useOffset = swoosh.xc_translation + swoosh.x24_useOffset;
|
||||
const zeus::CVector3f v0 =
|
||||
swoosh.x38_orientation * zeus::CVector3f(cosAng * swoosh.x4_leftRad, 0.f, sinAng * swoosh.x4_leftRad) +
|
||||
useOffset;
|
||||
zeus::CVector3f v1 = swoosh.x38_orientation *
|
||||
zeus::CVector3f(-cosAng * swoosh.x8_rightRad, 0.f, -sinAng * swoosh.x8_rightRad) +
|
||||
const zeus::CVector3f v1 = swoosh.x38_orientation * zeus::CVector3f(-cosAng * swoosh.x8_rightRad, 0.f,
|
||||
-sinAng * swoosh.x8_rightRad) +
|
||||
useOffset;
|
||||
|
||||
zeus::CColor color = swoosh.x6c_color * x20c_moduColor;
|
||||
const zeus::CColor color = swoosh.x6c_color * x20c_moduColor;
|
||||
|
||||
m_cachedVerts.push_back({v0, {uvOffset, x1d4_uvs.yMin}, color});
|
||||
m_cachedVerts.push_back({v1, {uvOffset, x1d4_uvs.yMax}, color});
|
||||
|
|
@ -834,43 +888,46 @@ void CParticleSwoosh::Render2SidedNoSplineNoGaps() {
|
|||
m_cachedVerts.push_back({v1, {uvOffset, x1d4_uvs.yMax}, color});
|
||||
}
|
||||
|
||||
if (x1ec_TSPN > 0)
|
||||
if (x1ec_TSPN > 0) {
|
||||
uvOffset += x1e8_uvSpan;
|
||||
else
|
||||
} else {
|
||||
uvOffset = float(i * x1e8_uvSpan);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
for (size_t i = 0; i < x15c_swooshes.size(); ++i) {
|
||||
SSwooshData& swoosh = x15c_swooshes[curIdx];
|
||||
const SSwooshData& swoosh = x15c_swooshes[curIdx];
|
||||
|
||||
curIdx -= 1;
|
||||
if (curIdx < 0)
|
||||
if (curIdx < 0) {
|
||||
curIdx = x15c_swooshes.size() - 1;
|
||||
}
|
||||
|
||||
if (swoosh.x0_active) {
|
||||
float ang = zeus::degToRad(swoosh.x30_irot + swoosh.x34_rotm);
|
||||
if (std::fabs(ang) > M_PIF) {
|
||||
ang -= std::floor(ang / (2.f * M_PIF)) * 2.f * M_PIF;
|
||||
if (ang > M_PIF)
|
||||
if (ang > M_PIF) {
|
||||
ang -= 2.f * M_PIF;
|
||||
else if (ang < -M_PIF)
|
||||
} else if (ang < -M_PIF) {
|
||||
ang += 2.f * M_PIF;
|
||||
}
|
||||
}
|
||||
|
||||
float sinAng = std::sin(ang);
|
||||
float cosAng = std::cos(ang);
|
||||
const float sinAng = std::sin(ang);
|
||||
const float cosAng = std::cos(ang);
|
||||
|
||||
zeus::CVector3f useOffset = swoosh.xc_translation + swoosh.x24_useOffset;
|
||||
zeus::CVector3f v0 =
|
||||
const zeus::CVector3f useOffset = swoosh.xc_translation + swoosh.x24_useOffset;
|
||||
const zeus::CVector3f v0 =
|
||||
swoosh.x38_orientation * zeus::CVector3f(cosAng * swoosh.x4_leftRad, 0.f, sinAng * swoosh.x4_leftRad) +
|
||||
useOffset;
|
||||
zeus::CVector3f v1 =
|
||||
const zeus::CVector3f v1 =
|
||||
swoosh.x38_orientation * zeus::CVector3f(-cosAng * swoosh.x8_rightRad, 0.f, -sinAng * swoosh.x8_rightRad) +
|
||||
useOffset;
|
||||
|
||||
zeus::CColor color = swoosh.x6c_color * x20c_moduColor;
|
||||
const zeus::CColor color = swoosh.x6c_color * x20c_moduColor;
|
||||
m_cachedVerts.push_back({v0, {}, color});
|
||||
m_cachedVerts.push_back({v1, {}, color});
|
||||
}
|
||||
|
|
@ -881,14 +938,17 @@ void CParticleSwoosh::Render2SidedNoSplineNoGaps() {
|
|||
}
|
||||
|
||||
void CParticleSwoosh::Render(const CActorLights*) {
|
||||
if (x1b4_LENG < 2 || x1ac_particleCount <= 1)
|
||||
if (x1b4_LENG < 2 || x1ac_particleCount <= 1) {
|
||||
return;
|
||||
}
|
||||
|
||||
SCOPED_GRAPHICS_DEBUG_GROUP(fmt::format(FMT_STRING("CParticleSwoosh::Render {}"),
|
||||
*x1c_desc.GetObjectTag()).c_str(), zeus::skYellow);
|
||||
|
||||
m_cachedVerts.clear();
|
||||
if (m_dataBind[0])
|
||||
if (m_dataBind[0]) {
|
||||
CGraphics::SetShaderDataBinding(m_dataBind[g_Renderer->IsThermalVisorHotPass()]);
|
||||
}
|
||||
|
||||
CParticleGlobals::instance()->SetParticleLifetime(x1b4_LENG);
|
||||
CGlobalRandom gr(x1c0_rand);
|
||||
|
|
@ -911,15 +971,18 @@ void CParticleSwoosh::Render(const CActorLights*) {
|
|||
x1d0_31_constantTex = texr->HasConstantTexture();
|
||||
x1d1_24_constantUv = texr->HasConstantUV();
|
||||
|
||||
if (CIntElement* tspn = x1c_desc->x40_TSPN.get())
|
||||
if (CIntElement* tspn = x1c_desc->x40_TSPN.get()) {
|
||||
tspn->GetValue(x28_curFrame, x1ec_TSPN);
|
||||
}
|
||||
|
||||
if (x1ec_TSPN <= 0)
|
||||
if (x1ec_TSPN <= 0) {
|
||||
x1ec_TSPN = x15c_swooshes.size() - 1;
|
||||
}
|
||||
|
||||
x1e8_uvSpan = 1.f;
|
||||
if (x1ec_TSPN > 0)
|
||||
if (x1ec_TSPN > 0) {
|
||||
x1e8_uvSpan = 1.f / float(x1ec_TSPN);
|
||||
}
|
||||
|
||||
// TEV0 modulate
|
||||
} else {
|
||||
|
|
@ -930,30 +993,34 @@ void CParticleSwoosh::Render(const CActorLights*) {
|
|||
|
||||
if (x1b8_SIDE == 2) {
|
||||
if (x1b0_SPLN <= 0) {
|
||||
if (x1d0_27_renderGaps)
|
||||
if (x1d0_27_renderGaps) {
|
||||
Render2SidedNoSplineGaps();
|
||||
else
|
||||
} else {
|
||||
Render2SidedNoSplineNoGaps();
|
||||
}
|
||||
} else {
|
||||
Render2SidedSpline();
|
||||
}
|
||||
} else if (x1b8_SIDE == 3) {
|
||||
if (x1b0_SPLN > 0)
|
||||
if (x1b0_SPLN > 0) {
|
||||
Render3SidedSolidSpline();
|
||||
else
|
||||
Render3SidedSolidNoSplineNoGaps();
|
||||
} else {
|
||||
if (x1b0_SPLN > 0)
|
||||
Render3SidedSolidNoSplineNoGaps();
|
||||
}
|
||||
} else {
|
||||
if (x1b0_SPLN > 0) {
|
||||
RenderNSidedSpline();
|
||||
else
|
||||
} else {
|
||||
RenderNSidedNoSpline();
|
||||
}
|
||||
}
|
||||
|
||||
zeus::CMatrix4f mvp = CGraphics::GetPerspectiveProjectionMatrix(true) * CGraphics::g_GXModelView.toMatrix4f();
|
||||
m_uniformBuf->load(&mvp, sizeof(zeus::CMatrix4f));
|
||||
if (m_cachedVerts.size())
|
||||
if (m_cachedVerts.size()) {
|
||||
m_vertBuf->load(m_cachedVerts.data(), m_cachedVerts.size() * sizeof(CParticleSwooshShaders::Vert));
|
||||
}
|
||||
}
|
||||
|
||||
void CParticleSwoosh::SetOrientation(const zeus::CTransform& xf) {
|
||||
x44_orientation = xf;
|
||||
|
|
@ -995,18 +1062,19 @@ const zeus::CVector3f& CParticleSwoosh::GetGlobalScale() const { return xe0_glob
|
|||
const zeus::CColor& CParticleSwoosh::GetModulationColor() const { return x20c_moduColor; }
|
||||
|
||||
bool CParticleSwoosh::IsSystemDeletable() const {
|
||||
if (x1d0_24_emitting && x28_curFrame < x2c_PSLT)
|
||||
if (x1d0_24_emitting && x28_curFrame < x2c_PSLT) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return GetParticleCount() < 2;
|
||||
}
|
||||
|
||||
std::optional<zeus::CAABox> CParticleSwoosh::GetBounds() const {
|
||||
if (GetParticleCount() <= 1) {
|
||||
zeus::CVector3f trans = x38_translation + xa4_globalTranslation;
|
||||
const zeus::CVector3f trans = x38_translation + xa4_globalTranslation;
|
||||
return zeus::CAABox(trans, trans);
|
||||
} else {
|
||||
zeus::CTransform xf = zeus::CTransform::Translate(xa4_globalTranslation) * xb0_globalOrientation * xec_scaleXf;
|
||||
const zeus::CTransform xf = zeus::CTransform::Translate(xa4_globalTranslation) * xb0_globalOrientation * xec_scaleXf;
|
||||
return zeus::CAABox(x1f0_aabbMin - x208_maxRadius, x1fc_aabbMax + x208_maxRadius).getTransformedAABox(xf);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue