AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-07-08 07:25:51 +00:00
Code Issues Projects Releases Wiki Activity

CElementGen: Resolve sign-conversion warnings in loops

Browse Source 
Prevents implicit truncation to int from occurring.
This commit is contained in:
Lioncash 2020-03-09 12:54:59 -04:00
parent 9db07b037a
commit a8486cf479
1 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
Runtime/Particle/CElementGen.cpp
View File

@ -925,7 +925,7 @@ void CElementGen::RenderModels(const CActorLights* actorLights) {
zeus::CVector3f pmopVec; zeus::CVector3f pmopVec;
auto matrixIt = x50_parentMatrices.begin(); auto matrixIt = x50_parentMatrices.begin();
for (int i = 0; i < x30_particles.size(); ++i) { for (size_t i = 0; i < x30_particles.size(); ++i) {
CParticle& particle = x30_particles[i]; CParticle& particle = x30_particles[i];
g_currentParticle = &particle; g_currentParticle = &particle;
@ -1124,7 +1124,7 @@ void CElementGen::RenderLines() {
m_lineRenderer->Reset(); m_lineRenderer->Reset();
for (int i = 0; i < x30_particles.size(); ++i) { for (size_t i = 0; i < x30_particles.size(); ++i) {
CParticle& particle = x30_particles[i]; CParticle& particle = x30_particles[i];
g_currentParticle = &particle; g_currentParticle = &particle;
@ -1227,9 +1227,9 @@ void CElementGen::RenderParticles() {
if (desc->x44_28_x30_28_SORT) { if (desc->x44_28_x30_28_SORT) {
sortItems.reserve(x30_particles.size()); sortItems.reserve(x30_particles.size());
for (int i = 0; i < x30_particles.size(); ++i) { for (size_t i = 0; i < x30_particles.size(); ++i) {
const CParticle& particle = x30_particles[i]; const CParticle& particle = x30_particles[i];
sortItems.emplace_back(i); sortItems.emplace_back(s16(i));
CParticleListItem& sortItem = sortItems.back(); CParticleListItem& sortItem = sortItems.back();
sortItem.x4_viewPoint = sortItem.x4_viewPoint =
systemCameraMatrix * ((particle.x4_pos - particle.x10_prevPos) * x80_timeDeltaScale + particle.x10_prevPos); systemCameraMatrix * ((particle.x4_pos - particle.x10_prevPos) * x80_timeDeltaScale + particle.x10_prevPos);
@ -1303,18 +1303,19 @@ void CElementGen::RenderParticles() {
} }
if (!x26c_29_ORNT) { if (!x26c_29_ORNT) {
for (int i = 0; i < x30_particles.size(); ++i) { for (size_t i = 0; i < x30_particles.size(); ++i) {
int partIdx = desc->x44_28_x30_28_SORT ? sortItems[i].x0_partIdx : i; const int partIdx = desc->x44_28_x30_28_SORT ? sortItems[i].x0_partIdx : int(i);
CParticle& particle = x30_particles[partIdx]; CParticle& particle = x30_particles[partIdx];
g_currentParticle = &particle; g_currentParticle = &particle;
int partFrame = x74_curFrame - particle.x28_startFrame - 1; const int partFrame = x74_curFrame - particle.x28_startFrame - 1;
zeus::CVector3f viewPoint; zeus::CVector3f viewPoint;
if (desc->x44_28_x30_28_SORT) if (desc->x44_28_x30_28_SORT) {
viewPoint = sortItems[i].x4_viewPoint; viewPoint = sortItems[i].x4_viewPoint;
else } else {
viewPoint = systemCameraMatrix * viewPoint = systemCameraMatrix *
((particle.x4_pos - particle.x10_prevPos) * x80_timeDeltaScale + particle.x10_prevPos); ((particle.x4_pos - particle.x10_prevPos) * x80_timeDeltaScale + particle.x10_prevPos);
}
if (!constUVs) { if (!constUVs) {
CParticleGlobals::instance()->SetParticleLifetime(particle.x0_endFrame - particle.x28_startFrame); CParticleGlobals::instance()->SetParticleLifetime(particle.x0_endFrame - particle.x28_startFrame);
@ -1322,7 +1323,7 @@ void CElementGen::RenderParticles() {
texr->GetValueUV(partFrame, uvs); texr->GetValueUV(partFrame, uvs);
} }
float size = 0.5f * particle.x2c_lineLengthOrSize; const float size = 0.5f * particle.x2c_lineLengthOrSize;
if (0.f == particle.x30_lineWidthOrRota) { if (0.f == particle.x30_lineWidthOrRota) {
switch (m_shaderClass) { switch (m_shaderClass) {
case CElementGenShaders::EShaderClass::Tex: { case CElementGenShaders::EShaderClass::Tex: {
@ -1392,15 +1393,15 @@ void CElementGen::RenderParticles() {
} }
} }
} else { } else {
for (int i = 0; i < x30_particles.size(); ++i) { for (size_t i = 0; i < x30_particles.size(); ++i) {
int partIdx = desc->x44_28_x30_28_SORT ? sortItems[i].x0_partIdx : i; const int partIdx = desc->x44_28_x30_28_SORT ? sortItems[i].x0_partIdx : int(i);
CParticle& particle = x30_particles[partIdx]; CParticle& particle = x30_particles[partIdx];
g_currentParticle = &particle; g_currentParticle = &particle;
int partFrame = x74_curFrame - particle.x28_startFrame - 1; const int partFrame = x74_curFrame - particle.x28_startFrame - 1;
zeus::CVector3f viewPoint = zeus::CVector3f viewPoint =
((particle.x4_pos - particle.x10_prevPos) * x80_timeDeltaScale + particle.x10_prevPos); ((particle.x4_pos - particle.x10_prevPos) * x80_timeDeltaScale + particle.x10_prevPos);
float width = !desc->x50_x3c_ROTA ? 1.f : particle.x30_lineWidthOrRota; const float width = !desc->x50_x3c_ROTA ? 1.f : particle.x30_lineWidthOrRota;
zeus::CVector3f dir; zeus::CVector3f dir;
if (particle.x1c_vel.canBeNormalized()) { if (particle.x1c_vel.canBeNormalized()) {
dir = particle.x1c_vel.normalized(); dir = particle.x1c_vel.normalized();
@ -1495,13 +1496,13 @@ void CElementGen::RenderParticles() {
Log.report(logvisor::Fatal, fmt("unexpected particle shader class")); Log.report(logvisor::Fatal, fmt("unexpected particle shader class"));
break; break;
} }
float mbspFac = 1.f / float(mbspVal); const float mbspFac = 1.f / float(mbspVal);
for (int i = 0; i < x30_particles.size(); ++i) { for (size_t i = 0; i < x30_particles.size(); ++i) {
int partIdx = desc->x44_28_x30_28_SORT ? sortItems[i].x0_partIdx : i; const int partIdx = desc->x44_28_x30_28_SORT ? sortItems[i].x0_partIdx : int(i);
CParticle& particle = x30_particles[partIdx]; CParticle& particle = x30_particles[partIdx];
g_currentParticle = &particle; g_currentParticle = &particle;
int partFrame = x74_curFrame - particle.x28_startFrame - 1; const int partFrame = x74_curFrame - particle.x28_startFrame - 1;
if (!constUVs) { if (!constUVs) {
CParticleGlobals::instance()->SetParticleLifetime(particle.x0_endFrame - particle.x28_startFrame); CParticleGlobals::instance()->SetParticleLifetime(particle.x0_endFrame - particle.x28_startFrame);
@ -1652,9 +1653,9 @@ void CElementGen::RenderParticlesIndirectTexture() {
if (desc->x44_28_x30_28_SORT) { if (desc->x44_28_x30_28_SORT) {
sortItems.reserve(x30_particles.size()); sortItems.reserve(x30_particles.size());
for (int i = 0; i < x30_particles.size(); ++i) { for (size_t i = 0; i < x30_particles.size(); ++i) {
const CParticle& particle = x30_particles[i]; const CParticle& particle = x30_particles[i];
sortItems.emplace_back(i); sortItems.emplace_back(s16(i));
CParticleListItem& sortItem = sortItems.back(); CParticleListItem& sortItem = sortItems.back();
sortItem.x4_viewPoint = sortItem.x4_viewPoint =
systemCameraMatrix * ((particle.x4_pos - particle.x10_prevPos) * x80_timeDeltaScale + particle.x10_prevPos); systemCameraMatrix * ((particle.x4_pos - particle.x10_prevPos) * x80_timeDeltaScale + particle.x10_prevPos);
@ -1671,18 +1672,19 @@ void CElementGen::RenderParticlesIndirectTexture() {
if (!x30_particles.empty()) if (!x30_particles.empty())
CGraphics::SetShaderDataBinding(m_normalDataBind[g_Renderer->IsThermalVisorHotPass()]); CGraphics::SetShaderDataBinding(m_normalDataBind[g_Renderer->IsThermalVisorHotPass()]);
for (int i = 0; i < x30_particles.size(); ++i) { for (size_t i = 0; i < x30_particles.size(); ++i) {
int partIdx = desc->x44_28_x30_28_SORT ? sortItems[i].x0_partIdx : i; const int partIdx = desc->x44_28_x30_28_SORT ? sortItems[i].x0_partIdx : int(i);
CParticle& particle = x30_particles[partIdx]; CParticle& particle = x30_particles[partIdx];
g_currentParticle = &particle; g_currentParticle = &particle;
int thisPartFrame = x74_curFrame - particle.x28_startFrame; const int thisPartFrame = x74_curFrame - particle.x28_startFrame;
zeus::CVector3f viewPoint; zeus::CVector3f viewPoint;
if (desc->x44_28_x30_28_SORT) if (desc->x44_28_x30_28_SORT) {
viewPoint = sortItems[i].x4_viewPoint; viewPoint = sortItems[i].x4_viewPoint;
else } else {
viewPoint = viewPoint =
systemCameraMatrix * ((particle.x4_pos - particle.x10_prevPos) * x80_timeDeltaScale + particle.x10_prevPos); systemCameraMatrix * ((particle.x4_pos - particle.x10_prevPos) * x80_timeDeltaScale + particle.x10_prevPos);
}
if (!constTexr) { if (!constTexr) {
CTexture* tex = texr->GetValueTexture(thisPartFrame).GetObj(); CTexture* tex = texr->GetValueTexture(thisPartFrame).GetObj();