AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update submodules

This commit is contained in:
Phillip Stephens 2019-08-18 18:49:54 -07:00
parent 44ea9e68ed
commit a41bd828e7
4 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
DataSpec/DNAMP1/ANCS.cpp
View File

@ -660,10 +660,6 @@ void ANCS::AnimationSet::MetaAnimFactory::Enumerate<BigDNA::ReadYaml>(athena::io
if (!type.compare("primitive")) { if (!type.compare("primitive")) {
m_anim.reset(new struct MetaAnimPrimitive); m_anim.reset(new struct MetaAnimPrimitive);
m_anim->read(reader); m_anim->read(reader);
if (static_cast<MetaAnimPrimitive*>(m_anim.get())->animName == "B_outofdig4_garbeetle") {
fmt::print(fmt("{} -> {}\n"), static_cast<MetaAnimPrimitive*>(m_anim.get())->animName,
static_cast<MetaAnimPrimitive*>(m_anim.get())->animId);
}
} else if (!type.compare("blend")) { } else if (!type.compare("blend")) {
m_anim.reset(new struct MetaAnimBlend); m_anim.reset(new struct MetaAnimBlend);
m_anim->read(reader); m_anim->read(reader);
@ -1063,8 +1059,6 @@ bool ANCS::Cook(const hecl::ProjectPath& outPath, const hecl::ProjectPath& inPat
hecl::SystemStringConv sysStr(prim.animName); hecl::SystemStringConv sysStr(prim.animName);
hecl::ProjectPath pathOut = inPath.ensureAuxInfo(hecl::SystemString(sysStr.sys_str()) + _SYS_STR(".ANIM")); hecl::ProjectPath pathOut = inPath.ensureAuxInfo(hecl::SystemString(sysStr.sys_str()) + _SYS_STR(".ANIM"));
prim.animId = pathOut; prim.animId = pathOut;
if (prim.animName == "B_outofdig4_garbeetle")
fmt::print(fmt("{}|{}\n"), pathOut.getRelativePathUTF8(), pathOut.getAuxInfoUTF8());
return true; return true;
}); });

8
Runtime/Graphics/CLineRenderer.cpp
View File

@ -24,7 +24,7 @@ CLineRenderer::CLineRenderer(boo::IGraphicsDataFactory::Context& ctx, EPrimitive
LineRendererLog.report(logvisor::Fatal, fmt(_SYS_STR("maxVerts < 2, maxVerts = {}")), maxVerts); LineRendererLog.report(logvisor::Fatal, fmt(_SYS_STR("maxVerts < 2, maxVerts = {}")), maxVerts);
return; return;
} }
m_textured = texture; m_textured = bool(texture);
u32 maxTriVerts; u32 maxTriVerts;
switch (mode) { switch (mode) {
@ -37,7 +37,7 @@ CLineRenderer::CLineRenderer(boo::IGraphicsDataFactory::Context& ctx, EPrimitive
break; break;
} }
if (texture) if (bool(texture))
m_vertBufTex = s_vertPoolTex.allocateBlock(CGraphics::g_BooFactory, maxTriVerts); m_vertBufTex = s_vertPoolTex.allocateBlock(CGraphics::g_BooFactory, maxTriVerts);
else else
m_vertBufNoTex = s_vertPoolNoTex.allocateBlock(CGraphics::g_BooFactory, maxTriVerts); m_vertBufNoTex = s_vertPoolNoTex.allocateBlock(CGraphics::g_BooFactory, maxTriVerts);
@ -54,7 +54,7 @@ CLineRenderer::CLineRenderer(EPrimitiveMode mode, u32 maxVerts, const boo::ObjTo
LineRendererLog.report(logvisor::Fatal, fmt(_SYS_STR("maxVerts < 2, maxVerts = {}")), maxVerts); LineRendererLog.report(logvisor::Fatal, fmt(_SYS_STR("maxVerts < 2, maxVerts = {}")), maxVerts);
return; return;
} }
m_textured = texture; m_textured = bool(texture);
u32 maxTriVerts; u32 maxTriVerts;
switch (mode) { switch (mode) {
@ -67,7 +67,7 @@ CLineRenderer::CLineRenderer(EPrimitiveMode mode, u32 maxVerts, const boo::ObjTo
break; break;
} }
if (texture) if (bool(texture))
m_vertBufTex = s_vertPoolTex.allocateBlock(CGraphics::g_BooFactory, maxTriVerts); m_vertBufTex = s_vertPoolTex.allocateBlock(CGraphics::g_BooFactory, maxTriVerts);
else else
m_vertBufNoTex = s_vertPoolNoTex.allocateBlock(CGraphics::g_BooFactory, maxTriVerts); m_vertBufNoTex = s_vertPoolNoTex.allocateBlock(CGraphics::g_BooFactory, maxTriVerts);

2
hecl

@ -1 +1 @@
Subproject commit 87c8205a91c748167456e02e1069a1cfc290728d Subproject commit 3508e9d536a540f51369acaef5b957cb91d53e8e

2
specter

@ -1 +1 @@
Subproject commit e57aa9f82763eec158aa029dcd125450fa26c2f7 Subproject commit ba31ba180f3cbc1ba9513befa95a4dbbdbaf38a4