ANSI C is fun!

This commit is contained in:
NathanSweet 2014-05-05 21:31:59 +02:00
parent 4346db1f31
commit f6cbff942f
2 changed files with 10 additions and 5 deletions

View File

@ -641,6 +641,8 @@ void _spFFDTimeline_apply (const spTimeline* timeline, spSkeleton* skeleton, flo
int* eventCount, float alpha) { int* eventCount, float alpha) {
int frameIndex, i; int frameIndex, i;
float percent, frameTime; float percent, frameTime;
const float* prevVertices;
const float* nextVertices;
spFFDTimeline* self = (spFFDTimeline*)timeline; spFFDTimeline* self = (spFFDTimeline*)timeline;
spSlot *slot = skeleton->slots[self->slotIndex]; spSlot *slot = skeleton->slots[self->slotIndex];
@ -677,8 +679,8 @@ void _spFFDTimeline_apply (const spTimeline* timeline, spSkeleton* skeleton, flo
percent = 1 - (time - frameTime) / (self->frames[frameIndex - 1] - frameTime); percent = 1 - (time - frameTime) / (self->frames[frameIndex - 1] - frameTime);
percent = spCurveTimeline_getCurvePercent(SUPER(self), frameIndex - 1, percent < 0 ? 0 : (percent > 1 ? 1 : percent)); percent = spCurveTimeline_getCurvePercent(SUPER(self), frameIndex - 1, percent < 0 ? 0 : (percent > 1 ? 1 : percent));
const float* prevVertices = self->frameVertices[frameIndex - 1]; prevVertices = self->frameVertices[frameIndex - 1];
const float* nextVertices = self->frameVertices[frameIndex]; nextVertices = self->frameVertices[frameIndex];
if (alpha < 1) { if (alpha < 1) {
for (i = 0; i < self->frameVerticesCount; ++i) { for (i = 0; i < self->frameVerticesCount; ++i) {

View File

@ -173,19 +173,22 @@ static const char* textureFilterNames[] = {"Nearest", "Linear", "MipMap", "MipMa
"MipMapNearestLinear", "MipMapLinearLinear"}; "MipMapNearestLinear", "MipMapLinearLinear"};
spAtlas* spAtlas_create (const char* begin, int length, const char* dir, void* rendererObject) { spAtlas* spAtlas_create (const char* begin, int length, const char* dir, void* rendererObject) {
spAtlas* self;
int count; int count;
const char* end = begin + length; const char* end = begin + length;
int dirLength = strlen(dir); int dirLength = strlen(dir);
int needsSlash = dirLength > 0 && dir[dirLength - 1] != '/' && dir[dirLength - 1] != '\\'; int needsSlash = dirLength > 0 && dir[dirLength - 1] != '/' && dir[dirLength - 1] != '\\';
spAtlas* self = NEW(spAtlas);
self->rendererObject = rendererObject;
spAtlasPage *page = 0; spAtlasPage *page = 0;
spAtlasPage *lastPage = 0; spAtlasPage *lastPage = 0;
spAtlasRegion *lastRegion = 0; spAtlasRegion *lastRegion = 0;
Str str; Str str;
Str tuple[4]; Str tuple[4];
self = NEW(spAtlas);
self->rendererObject = rendererObject;
readLine(begin, 0, 0); readLine(begin, 0, 0);
while (readLine(0, end, &str)) { while (readLine(0, end, &str)) {
if (str.end - str.begin == 0) { if (str.end - str.begin == 0) {