NathanSweet пре 11 година
родитељ
комит
f6cbff942f
2 измењених фајлова са 10 додато и 5 уклоњено
  1. 4 2
      spine-c/src/spine/Animation.c
  2. 6 3
      spine-c/src/spine/Atlas.c

+ 4 - 2
spine-c/src/spine/Animation.c

@@ -641,6 +641,8 @@ void _spFFDTimeline_apply (const spTimeline* timeline, spSkeleton* skeleton, flo
 		int* eventCount, float alpha) {
 	int frameIndex, i;
 	float percent, frameTime;
+	const float* prevVertices;
+	const float* nextVertices;
 	spFFDTimeline* self = (spFFDTimeline*)timeline;
 
 	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 = spCurveTimeline_getCurvePercent(SUPER(self), frameIndex - 1, percent < 0 ? 0 : (percent > 1 ? 1 : percent));
 
-	const float* prevVertices = self->frameVertices[frameIndex - 1];
-	const float* nextVertices = self->frameVertices[frameIndex];
+	prevVertices = self->frameVertices[frameIndex - 1];
+	nextVertices = self->frameVertices[frameIndex];
 
 	if (alpha < 1) {
 		for (i = 0; i < self->frameVerticesCount; ++i) {

+ 6 - 3
spine-c/src/spine/Atlas.c

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