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

Windows fixes

Browse Source
This commit is contained in:
Jack Andersen
2016-12-10 15:54:08 -10:00
parent 0dc6729144
commit 3a24b35df7
17 changed files with 34 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Runtime/Character/CFBStreamedAnimReader.cpp
View File

@@ -29,7 +29,7 @@ void CFBStreamedAnimReaderTotals::Initialize(const CFBStreamedCompression& sourc
if (source.m_pc)
{
for (int b=0 ; b<boneChanCount ; ++b)
for (unsigned b=0 ; b<boneChanCount ; ++b)
{
xc_segIds2[b] = *reinterpret_cast<const u32*>(chans);
chans += 8;
@@ -59,7 +59,7 @@ void CFBStreamedAnimReaderTotals::Initialize(const CFBStreamedCompression& sourc
}
else
{
for (int b=0 ; b<boneChanCount ; ++b)
for (unsigned b=0 ; b<boneChanCount ; ++b)
{
xc_segIds2[b] = *reinterpret_cast<const u32*>(chans);
chans += 6;
@@ -111,7 +111,7 @@ void CFBStreamedAnimReaderTotals::IncrementInto(CBitLevelLoader& loader,
if (source.m_pc)
{
for (int b=0 ; b<boneChanCount ; ++b)
for (unsigned b=0 ; b<boneChanCount ; ++b)
{
chans += 8;
@@ -138,7 +138,7 @@ void CFBStreamedAnimReaderTotals::IncrementInto(CBitLevelLoader& loader,
}
else
{
for (int b=0 ; b<boneChanCount ; ++b)
for (unsigned b=0 ; b<boneChanCount ; ++b)
{
chans += 6;
@@ -167,7 +167,7 @@ void CFBStreamedAnimReaderTotals::IncrementInto(CBitLevelLoader& loader,
void CFBStreamedAnimReaderTotals::CalculateDown()
{
for (int b=0 ; b<x24_boneChanCount ; ++b)
for (unsigned b=0 ; b<x24_boneChanCount ; ++b)
{
const s32* cumulativesIn = &x4_cumulativeInts32[8*b];
float* compOut = &x10_computedFloats32[8*b];
@@ -213,7 +213,7 @@ void CFBStreamedPairOfTotals::SetTime(CBitLevelLoader& loader, const CCharAnimTi
int prior = -1;
int next = -1;
int cur = 0;
for (int b=0 ; b<timeBitmap[0] ; ++b)
for (unsigned b=0 ; b<timeBitmap[0] ; ++b)
{
int word = b / 32;
int bit = b % 32;
@@ -243,7 +243,7 @@ void CFBStreamedPairOfTotals::SetTime(CBitLevelLoader& loader, const CCharAnimTi
curTime += interval;
}
if (prior != -1 && prior < Prior().x1c_curKey)
if (prior != -1 && u32(prior) < Prior().x1c_curKey)
{
Prior().Initialize(*x0_source);
Next().Initialize(*x0_source);
@@ -251,7 +251,7 @@ void CFBStreamedPairOfTotals::SetTime(CBitLevelLoader& loader, const CCharAnimTi
}
if (next != -1)
while (next > Next().x1c_curKey)
while (u32(next) > Next().x1c_curKey)
DoIncrement(loader);
if (!Prior().IsCalculated())