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

Updated hecl

This commit is contained in:
Jack Andersen 2015-11-17 20:17:06 -10:00
parent d7c17804ee
commit 12fb5814a7
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
DataSpec/DNAMP1/CMDLMaterials.cpp
View File

@ -967,7 +967,7 @@ MaterialSet::Material::Material(const HECL::Backend::GX& gx,
atUint16 texFlags = 0; atUint16 texFlags = 0;
tevStageTexInfo.reserve(gx.m_tevCount); tevStageTexInfo.reserve(gx.m_tevCount);
textureIdxs.reserve(gx.m_tevCount); textureIdxs.reserve(gx.m_tevCount);
for (int i=0 ; i<gx.m_tevCount ; ++i) for (unsigned i=0 ; i<gx.m_tevCount ; ++i)
{ {
const HECL::Backend::GX::TEVStage& stage = gx.m_tevs[i]; const HECL::Backend::GX::TEVStage& stage = gx.m_tevs[i];
tevStageTexInfo.emplace_back(); tevStageTexInfo.emplace_back();
@ -1043,7 +1043,7 @@ MaterialSet::Material::Material(const HECL::Backend::GX& gx,
groupIdx = setIdxIn; groupIdx = setIdxIn;
for (int i=0 ; i<gx.m_kcolorCount ; ++i) for (unsigned i=0 ; i<gx.m_kcolorCount ; ++i)
konstColors.emplace_back(gx.m_kcolors[i]); konstColors.emplace_back(gx.m_kcolors[i]);
blendDstFac = BlendFactor(gx.m_blendDst); blendDstFac = BlendFactor(gx.m_blendDst);
@ -1054,7 +1054,7 @@ MaterialSet::Material::Material(const HECL::Backend::GX& gx,
colorChannelCount = 1; colorChannelCount = 1;
colorChannels.emplace_back(); colorChannels.emplace_back();
ColorChannel& ch = colorChannels.back(); ColorChannel& ch = colorChannels.back();
for (int i=0 ; i<gx.m_tevCount ; ++i) for (unsigned i=0 ; i<gx.m_tevCount ; ++i)
{ {
const HECL::Backend::GX::TEVStage& stage = gx.m_tevs[i]; const HECL::Backend::GX::TEVStage& stage = gx.m_tevs[i];
for (int c=0 ; c<4 ; ++c) for (int c=0 ; c<4 ; ++c)
@ -1073,7 +1073,7 @@ MaterialSet::Material::Material(const HECL::Backend::GX& gx,
tevStageCount = gx.m_tevCount; tevStageCount = gx.m_tevCount;
tevStages.reserve(gx.m_tevCount); tevStages.reserve(gx.m_tevCount);
for (int i=0 ; i<gx.m_tevCount ; ++i) for (unsigned i=0 ; i<gx.m_tevCount ; ++i)
{ {
const HECL::Backend::GX::TEVStage& stage = gx.m_tevs[i]; const HECL::Backend::GX::TEVStage& stage = gx.m_tevs[i];
tevStages.emplace_back(); tevStages.emplace_back();
@ -1102,7 +1102,7 @@ MaterialSet::Material::Material(const HECL::Backend::GX& gx,
} }
tcgCount = gx.m_tcgCount; tcgCount = gx.m_tcgCount;
for (int i=0 ; i<gx.m_tcgCount ; ++i) for (unsigned i=0 ; i<gx.m_tcgCount ; ++i)
{ {
const HECL::Backend::GX::TexCoordGen& tcg = gx.m_tcgs[i]; const HECL::Backend::GX::TexCoordGen& tcg = gx.m_tcgs[i];
tcgs.emplace_back(); tcgs.emplace_back();
@ -1130,7 +1130,7 @@ MaterialSet::Material::Material(const HECL::Backend::GX& gx,
for (; uvAnimsCount<8 ;) for (; uvAnimsCount<8 ;)
{ {
bool found = false; bool found = false;
for (int t=0 ; t<gx.m_tcgCount ; ++t) for (unsigned t=0 ; t<gx.m_tcgCount ; ++t)
{ {
const HECL::Backend::GX::TexCoordGen& tcg = gx.m_tcgs[t]; const HECL::Backend::GX::TexCoordGen& tcg = gx.m_tcgs[t];
if (tcg.m_mtx == GX::IDENTITY) if (tcg.m_mtx == GX::IDENTITY)

2
hecl

@ -1 +1 @@
Subproject commit 082700b15331061c3599e94d864e9f50cdfc7ff1 Subproject commit 543527e8cad6e46928917bf77a3c790f60b201c3