AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 22:27:43 +00:00
Code Issues Projects Releases Wiki Activity

Update fmtlib

Browse Source
This commit is contained in:
Jack Andersen
2020-04-11 12:51:39 -10:00
parent 7055b6983f
commit 5b4441ac36
156 changed files with 786 additions and 777 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Runtime/Particle/CElementGen.cpp
View File

@@ -255,7 +255,7 @@ bool CElementGen::Update(double t) {
if (pswtElem && !x26d_25_warmedUp) {
int pswt = 0;
pswtElem->GetValue(x74_curFrame, pswt);
//Log.report(logvisor::Info, fmt("Running warmup on particle system 0x%08x for %d ticks."), desc, pswt);
//Log.report(logvisor::Info, FMT_STRING("Running warmup on particle system 0x%08x for %d ticks."), desc, pswt);
InternalUpdate((1.f / 60.f) * pswt);
x26d_25_warmedUp = true;
}
@@ -813,7 +813,7 @@ u32 CElementGen::GetSystemCount() const {
}
void CElementGen::Render(const CActorLights* actorLights) {
SCOPED_GRAPHICS_DEBUG_GROUP(fmt::format(fmt("CElementGen::Render {}"),
SCOPED_GRAPHICS_DEBUG_GROUP(fmt::format(FMT_STRING("CElementGen::Render {}"),
*x1c_genDesc.GetObjectTag()).c_str(), zeus::skYellow);
CGenDescription* desc = x1c_genDesc.GetObj();
@@ -898,7 +898,7 @@ void CElementGen::RenderModels(const CActorLights* actorLights) {
g_instNoTexData.reserve(x30_particles.size());
break;
default:
Log.report(logvisor::Fatal, fmt("unexpected particle shader class"));
Log.report(logvisor::Fatal, FMT_STRING("unexpected particle shader class"));
break;
}
@@ -1310,7 +1310,7 @@ void CElementGen::RenderParticles() {
g_instNoTexData.reserve(x30_particles.size());
break;
default:
Log.report(logvisor::Fatal, fmt("unexpected particle shader class"));
Log.report(logvisor::Fatal, FMT_STRING("unexpected particle shader class"));
break;
}
@@ -1499,7 +1499,7 @@ void CElementGen::RenderParticles() {
g_instNoTexData.reserve(x30_particles.size() * mbspVal);
break;
default:
Log.report(logvisor::Fatal, fmt("unexpected particle shader class"));
Log.report(logvisor::Fatal, FMT_STRING("unexpected particle shader class"));
break;
}
const float mbspFac = 1.f / float(mbspVal);