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

Merge branch 'master' of https://github.com/AxioDL/hecl

This commit is contained in:
Jack Andersen 2015-10-15 14:35:22 -10:00
parent 2034a83576 0f921f9183
commit edf368b1b1
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hecl/blender/BlenderConnection.cpp
View File

@ -380,8 +380,6 @@ bool BlenderConnection::openBlend(const ProjectPath& path)
"BlenderConnection::openBlend() musn't be called with stream active");
return false;
}
if (path == m_loadedBlend)
return true;
_writeLine(("OPEN \"" + path.getAbsolutePathUTF8() + "\"").c_str());
char lineBuf[256];
_readLine(lineBuf, sizeof(lineBuf));

2
hecl/include/HECL/Frontend.hpp
View File

@ -164,7 +164,7 @@ struct IR
Instruction(OpType type, const SourceLocation& loc) : m_op(type), m_loc(loc) {}
ssize_t getChildCount() const
int getChildCount() const
{
switch (m_op)
{

4
hecl/include/HECL/HECL.hpp
View File

@ -604,6 +604,10 @@ public:
pp.m_relPath += ext;
pp.m_absPath += ext;
}
#if HECL_UCS2
pp.m_utf8AbsPath = WideToUTF8(pp.m_absPath);
pp.m_utf8RelPath = WideToUTF8(pp.m_relPath);
#endif
return pp;
}

6
hecl/lib/Backend/GX.cpp
View File

@ -94,7 +94,7 @@ unsigned GX::RecursiveTraceTexGen(const IR& ir, Diagnostics& diag, const IR::Ins
++m_texMtxCount;
tcg.m_gameFunction = tcgName;
tcg.m_gameArgs.clear();
for (ssize_t i=1 ; i<inst.getChildCount() ; ++i)
for (int i=1 ; i<inst.getChildCount() ; ++i)
{
const IR::Instruction& ci = inst.getChildInst(ir, i);
tcg.m_gameArgs.push_back(ci.getImmVec());
@ -361,7 +361,7 @@ GX::TraceResult GX::RecursiveTraceAlpha(const IR& ir, Diagnostics& diag, const I
unsigned mapIdx = unsigned(mapImm.vec[0]);
int foundStage = -1;
for (int i=0 ; i<m_tevCount ; ++i)
for (int i=0 ; i<int(m_tevCount) ; ++i)
{
TEVStage& testStage = m_tevs[i];
if (testStage.m_texMapIdx == mapIdx && i > m_alphaTraceStage)
@ -657,7 +657,7 @@ void GX::reset(const IR& ir, Diagnostics& diag)
/* Ensure Alpha reaches end of chain */
if (m_alphaTraceStage >= 0)
for (int i=m_alphaTraceStage+1 ; i<m_tevCount ; ++i)
for (unsigned i=m_alphaTraceStage+1 ; i<m_tevCount ; ++i)
m_tevs[i].m_alpha[3] = CA_APREV;
}