UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-21 09:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

[c, cpp] Renamed frameIndex parameters.

Browse Source 
frame: frame number, 0 to frameCount - 1.
frameIndex: index into frames[].
This commit is contained in:
Nathan Sweet 2021-06-04 10:50:26 -04:00
parent 7bc5d995a3
commit a8b79a66e1
5 changed files with 123 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

200
spine-c/spine-c/src/spine/Animation.c
View File

@ -199,13 +199,13 @@ void _spCurveTimeline_setBezier (spTimeline* timeline, int bezier, int frame, fl
} }
} }
float _spCurveTimeline_getBezierValue(spCurveTimeline* self, float time, int frame, int valueOffset, int i) { float _spCurveTimeline_getBezierValue(spCurveTimeline* self, float time, int frameIndex, int valueOffset, int i) {
float* curves = self->curves->items; float* curves = self->curves->items;
float* frames = SUPER(self)->frames->items; float* frames = SUPER(self)->frames->items;
float x, y; float x, y;
int n; int n;
if (curves[i] > time) { if (curves[i] > time) {
x = frames[frame]; y = frames[frame + valueOffset]; x = frames[frameIndex]; y = frames[frameIndex + valueOffset];
return y + (time - x) / (curves[i] - x) * (curves[i + 1] - y); return y + (time - x) / (curves[i] - x) * (curves[i + 1] - y);
} }
n = i + BEZIER_SIZE; n = i + BEZIER_SIZE;
@ -215,17 +215,17 @@ float _spCurveTimeline_getBezierValue(spCurveTimeline* self, float time, int fra
return y + (time - x) / (curves[i] - x) * (curves[i + 1] - y); return y + (time - x) / (curves[i] - x) * (curves[i + 1] - y);
} }
} }
frame += self->super.frameEntries; frameIndex += self->super.frameEntries;
x = curves[n - 2]; y = curves[n - 1]; x = curves[n - 2]; y = curves[n - 1];
return y + (time - x) / (frames[frame] - x) * (frames[frame + valueOffset] - y); return y + (time - x) / (frames[frameIndex] - x) * (frames[frameIndex + valueOffset] - y);
} }
void spCurveTimeline_setLinear (spCurveTimeline* self, int frameIndex) { void spCurveTimeline_setLinear (spCurveTimeline* self, int frame) {
self->curves->items[frameIndex] = CURVE_LINEAR; self->curves->items[frame] = CURVE_LINEAR;
} }
void spCurveTimeline_setStepped (spCurveTimeline* self, int frameIndex) { void spCurveTimeline_setStepped (spCurveTimeline* self, int frame) {
self->curves->items[frameIndex] = CURVE_STEPPED; self->curves->items[frame] = CURVE_STEPPED;
} }
#define CURVE1_ENTRIES 2 #define CURVE1_ENTRIES 2
@ -327,8 +327,8 @@ spRotateTimeline* spRotateTimeline_create (int frameCount, int bezierCount, int
return timeline; return timeline;
} }
void spRotateTimeline_setFrame (spRotateTimeline* self, int frameIndex, float time, float degrees) { void spRotateTimeline_setFrame (spRotateTimeline* self, int frame, float time, float degrees) {
spCurveTimeline1_setFrame(SUPER(self), frameIndex, time, degrees); spCurveTimeline1_setFrame(SUPER(self), frame, time, degrees);
} }
/**/ /**/
@ -415,8 +415,8 @@ spTranslateTimeline* spTranslateTimeline_create (int frameCount, int bezierCount
return timeline; return timeline;
} }
void spTranslateTimeline_setFrame (spTranslateTimeline* self, int frameIndex, float time, float x, float y) { void spTranslateTimeline_setFrame (spTranslateTimeline* self, int frame, float time, float x, float y) {
spCurveTimeline2_setFrame(SUPER(self), frameIndex, time, x, y); spCurveTimeline2_setFrame(SUPER(self), frame, time, x, y);
} }
/**/ /**/
@ -659,8 +659,8 @@ spScaleTimeline* spScaleTimeline_create (int frameCount, int bezierCount, int bo
return timeline; return timeline;
} }
void spScaleTimeline_setFrame (spScaleTimeline* self, int frameIndex, float time, float x, float y) { void spScaleTimeline_setFrame (spScaleTimeline* self, int frame, float time, float x, float y) {
spCurveTimeline2_setFrame(SUPER(self), frameIndex, time, x, y); spCurveTimeline2_setFrame(SUPER(self), frame, time, x, y);
} }
/**/ /**/
@ -918,8 +918,8 @@ spShearTimeline* spShearTimeline_create (int frameCount, int bezierCount, int bo
return timeline; return timeline;
} }
void spShearTimeline_setFrame (spShearTimeline* self, int frameIndex, float time, float x, float y) { void spShearTimeline_setFrame (spShearTimeline* self, int frame, float time, float x, float y) {
spCurveTimeline2_setFrame(SUPER(self), frameIndex, time, x, y); spCurveTimeline2_setFrame(SUPER(self), frame, time, x, y);
} }
/**/ /**/
@ -1129,14 +1129,14 @@ spRGBATimeline* spRGBATimeline_create (int framesCount, int bezierCount, int slo
return timeline; return timeline;
} }
void spRGBATimeline_setFrame (spRGBATimeline* self, int frameIndex, float time, float r, float g, float b, float a) { void spRGBATimeline_setFrame (spRGBATimeline* self, int frame, float time, float r, float g, float b, float a) {
float *frames = self->super.super.frames->items; float *frames = self->super.super.frames->items;
frameIndex *= RGBA_ENTRIES; frame *= RGBA_ENTRIES;
frames[frameIndex] = time; frames[frame] = time;
frames[frameIndex + COLOR_R] = r; frames[frame + COLOR_R] = r;
frames[frameIndex + COLOR_G] = g; frames[frame + COLOR_G] = g;
frames[frameIndex + COLOR_B] = b; frames[frame + COLOR_B] = b;
frames[frameIndex + COLOR_A] = a; frames[frame + COLOR_A] = a;
} }
/**/ /**/
@ -1231,13 +1231,13 @@ spRGBTimeline* spRGBTimeline_create (int framesCount, int bezierCount, int slotI
return timeline; return timeline;
} }
void spRGBTimeline_setFrame (spRGBTimeline* self, int frameIndex, float time, float r, float g, float b) { void spRGBTimeline_setFrame (spRGBTimeline* self, int frame, float time, float r, float g, float b) {
float *frames = self->super.super.frames->items; float *frames = self->super.super.frames->items;
frameIndex *= RGB_ENTRIES; frame *= RGB_ENTRIES;
frames[frameIndex] = time; frames[frame] = time;
frames[frameIndex + COLOR_R] = r; frames[frame + COLOR_R] = r;
frames[frameIndex + COLOR_G] = g; frames[frame + COLOR_G] = g;
frames[frameIndex + COLOR_B] = b; frames[frame + COLOR_B] = b;
} }
/**/ /**/
@ -1417,17 +1417,17 @@ spRGBA2Timeline* spRGBA2Timeline_create (int framesCount, int bezierCount, int s
return timeline; return timeline;
} }
void spRGBA2Timeline_setFrame (spRGBA2Timeline* self, int frameIndex, float time, float r, float g, float b, float a, float r2, float g2, float b2) { void spRGBA2Timeline_setFrame (spRGBA2Timeline* self, int frame, float time, float r, float g, float b, float a, float r2, float g2, float b2) {
float *frames = self->super.super.frames->items; float *frames = self->super.super.frames->items;
frameIndex *= RGBA2_ENTRIES; frame *= RGBA2_ENTRIES;
frames[frameIndex] = time; frames[frame] = time;
frames[frameIndex + COLOR_R] = r; frames[frame + COLOR_R] = r;
frames[frameIndex + COLOR_G] = g; frames[frame + COLOR_G] = g;
frames[frameIndex + COLOR_B] = b; frames[frame + COLOR_B] = b;
frames[frameIndex + COLOR_A] = a; frames[frame + COLOR_A] = a;
frames[frameIndex + COLOR_R2] = r2; frames[frame + COLOR_R2] = r2;
frames[frameIndex + COLOR_G2] = g2; frames[frame + COLOR_G2] = g2;
frames[frameIndex + COLOR_B2] = b2; frames[frame + COLOR_B2] = b2;
} }
/**/ /**/
@ -1545,16 +1545,16 @@ spRGB2Timeline* spRGB2Timeline_create (int framesCount, int bezierCount, int slo
return timeline; return timeline;
} }
void spRGB2Timeline_setFrame (spRGB2Timeline* self, int frameIndex, float time, float r, float g, float b, float r2, float g2, float b2) { void spRGB2Timeline_setFrame (spRGB2Timeline* self, int frame, float time, float r, float g, float b, float r2, float g2, float b2) {
float *frames = self->super.super.frames->items; float *frames = self->super.super.frames->items;
frameIndex *= RGB2_ENTRIES; frame *= RGB2_ENTRIES;
frames[frameIndex] = time; frames[frame] = time;
frames[frameIndex + COLOR_R] = r; frames[frame + COLOR_R] = r;
frames[frameIndex + COLOR_G] = g; frames[frame + COLOR_G] = g;
frames[frameIndex + COLOR_B] = b; frames[frame + COLOR_B] = b;
frames[frameIndex + COLOR2_R2] = r2; frames[frame + COLOR2_R2] = r2;
frames[frameIndex + COLOR2_G2] = g2; frames[frame + COLOR2_G2] = g2;
frames[frameIndex + COLOR2_B2] = b2; frames[frame + COLOR2_B2] = b2;
} }
/**/ /**/
@ -1616,14 +1616,14 @@ spAttachmentTimeline* spAttachmentTimeline_create (int framesCount, int slotInde
return self; return self;
} }
void spAttachmentTimeline_setFrame (spAttachmentTimeline* self, int frameIndex, float time, const char* attachmentName) { void spAttachmentTimeline_setFrame (spAttachmentTimeline* self, int frame, float time, const char* attachmentName) {
self->super.frames->items[frameIndex] = time; self->super.frames->items[frame] = time;
FREE(self->attachmentNames[frameIndex]); FREE(self->attachmentNames[frame]);
if (attachmentName) if (attachmentName)
MALLOC_STR(self->attachmentNames[frameIndex], attachmentName); MALLOC_STR(self->attachmentNames[frame], attachmentName);
else else
self->attachmentNames[frameIndex] = 0; self->attachmentNames[frame] = 0;
} }
/**/ /**/
@ -1918,15 +1918,15 @@ spDeformTimeline* spDeformTimeline_create (int framesCount, int frameVerticesCou
return self; return self;
} }
void spDeformTimeline_setFrame (spDeformTimeline* self, int frameIndex, float time, float* vertices) { void spDeformTimeline_setFrame (spDeformTimeline* self, int frame, float time, float* vertices) {
self->super.super.frames->items[frameIndex] = time; self->super.super.frames->items[frame] = time;
FREE(self->frameVertices[frameIndex]); FREE(self->frameVertices[frame]);
if (!vertices) if (!vertices)
self->frameVertices[frameIndex] = 0; self->frameVertices[frame] = 0;
else { else {
self->frameVertices[frameIndex] = MALLOC(float, self->frameVerticesCount); self->frameVertices[frame] = MALLOC(float, self->frameVerticesCount);
memcpy(CONST_CAST(float*, self->frameVertices[frameIndex]), vertices, self->frameVerticesCount * sizeof(float)); memcpy(CONST_CAST(float*, self->frameVertices[frame]), vertices, self->frameVerticesCount * sizeof(float));
} }
} }
@ -1989,11 +1989,11 @@ spEventTimeline* spEventTimeline_create (int framesCount) {
return self; return self;
} }
void spEventTimeline_setFrame (spEventTimeline* self, int frameIndex, spEvent* event) { void spEventTimeline_setFrame (spEventTimeline* self, int frame, spEvent* event) {
self->super.frames->items[frameIndex] = event->time; self->super.frames->items[frame] = event->time;
FREE(self->events[frameIndex]); FREE(self->events[frame]);
self->events[frameIndex] = event; self->events[frame] = event;
} }
/**/ /**/
@ -2052,15 +2052,15 @@ spDrawOrderTimeline* spDrawOrderTimeline_create (int framesCount, int slotsCount
return self; return self;
} }
void spDrawOrderTimeline_setFrame (spDrawOrderTimeline* self, int frameIndex, float time, const int* drawOrder) { void spDrawOrderTimeline_setFrame (spDrawOrderTimeline* self, int frame, float time, const int* drawOrder) {
self->super.frames->items[frameIndex] = time; self->super.frames->items[frame] = time;
FREE(self->drawOrders[frameIndex]); FREE(self->drawOrders[frame]);
if (!drawOrder) if (!drawOrder)
self->drawOrders[frameIndex] = 0; self->drawOrders[frame] = 0;
else { else {
self->drawOrders[frameIndex] = MALLOC(int, self->slotsCount); self->drawOrders[frame] = MALLOC(int, self->slotsCount);
memcpy(CONST_CAST(int*, self->drawOrders[frameIndex]), drawOrder, self->slotsCount * sizeof(int)); memcpy(CONST_CAST(int*, self->drawOrders[frame]), drawOrder, self->slotsCount * sizeof(int));
} }
} }
@ -2164,17 +2164,17 @@ spIkConstraintTimeline* spIkConstraintTimeline_create (int framesCount, int bezi
return timeline; return timeline;
} }
void spIkConstraintTimeline_setFrame (spIkConstraintTimeline* self, int frameIndex, float time, float mix, float softness, void spIkConstraintTimeline_setFrame (spIkConstraintTimeline* self, int frame, float time, float mix, float softness,
int bendDirection, int /*boolean*/ compress, int /*boolean*/ stretch int bendDirection, int /*boolean*/ compress, int /*boolean*/ stretch
) { ) {
float *frames = self->super.super.frames->items; float *frames = self->super.super.frames->items;
frameIndex *= IKCONSTRAINT_ENTRIES; frame *= IKCONSTRAINT_ENTRIES;
frames[frameIndex] = time; frames[frame] = time;
frames[frameIndex + IKCONSTRAINT_MIX] = mix; frames[frame + IKCONSTRAINT_MIX] = mix;
frames[frameIndex + IKCONSTRAINT_SOFTNESS] = softness; frames[frame + IKCONSTRAINT_SOFTNESS] = softness;
frames[frameIndex + IKCONSTRAINT_BEND_DIRECTION] = (float)bendDirection; frames[frame + IKCONSTRAINT_BEND_DIRECTION] = (float)bendDirection;
frames[frameIndex + IKCONSTRAINT_COMPRESS] = compress ? 1 : 0; frames[frame + IKCONSTRAINT_COMPRESS] = compress ? 1 : 0;
frames[frameIndex + IKCONSTRAINT_STRETCH] = stretch ? 1 : 0; frames[frame + IKCONSTRAINT_STRETCH] = stretch ? 1 : 0;
} }
/**/ /**/
@ -2297,16 +2297,16 @@ spTransformConstraintTimeline* spTransformConstraintTimeline_create (int framesC
return timeline; return timeline;
} }
void spTransformConstraintTimeline_setFrame (spTransformConstraintTimeline* self, int frameIndex, float time, float mixRotate, float mixX, float mixY, float mixScaleX, float mixScaleY, float mixShearY) { void spTransformConstraintTimeline_setFrame (spTransformConstraintTimeline* self, int frame, float time, float mixRotate, float mixX, float mixY, float mixScaleX, float mixScaleY, float mixShearY) {
float *frames = self->super.super.frames->items; float *frames = self->super.super.frames->items;
frameIndex *= TRANSFORMCONSTRAINT_ENTRIES; frame *= TRANSFORMCONSTRAINT_ENTRIES;
frames[frameIndex] = time; frames[frame] = time;
frames[frameIndex + TRANSFORMCONSTRAINT_ROTATE] = mixRotate; frames[frame + TRANSFORMCONSTRAINT_ROTATE] = mixRotate;
frames[frameIndex + TRANSFORMCONSTRAINT_X] = mixX; frames[frame + TRANSFORMCONSTRAINT_X] = mixX;
frames[frameIndex + TRANSFORMCONSTRAINT_X] = mixY; frames[frame + TRANSFORMCONSTRAINT_X] = mixY;
frames[frameIndex + TRANSFORMCONSTRAINT_SCALEX] = mixScaleX; frames[frame + TRANSFORMCONSTRAINT_SCALEX] = mixScaleX;
frames[frameIndex + TRANSFORMCONSTRAINT_SCALEY] = mixScaleY; frames[frame + TRANSFORMCONSTRAINT_SCALEY] = mixScaleY;
frames[frameIndex + TRANSFORMCONSTRAINT_SHEARY] = mixShearY; frames[frame + TRANSFORMCONSTRAINT_SHEARY] = mixShearY;
} }
/**/ /**/
@ -2361,11 +2361,11 @@ spPathConstraintPositionTimeline* spPathConstraintPositionTimeline_create (int f
return timeline; return timeline;
} }
void spPathConstraintPositionTimeline_setFrame (spPathConstraintPositionTimeline* self, int frameIndex, float time, float value) { void spPathConstraintPositionTimeline_setFrame (spPathConstraintPositionTimeline* self, int frame, float time, float value) {
float *frames = self->super.super.frames->items; float *frames = self->super.super.frames->items;
frameIndex *= PATHCONSTRAINTPOSITION_ENTRIES; frame *= PATHCONSTRAINTPOSITION_ENTRIES;
frames[frameIndex] = time; frames[frame] = time;
frames[frameIndex + PATHCONSTRAINTPOSITION_VALUE] = value; frames[frame + PATHCONSTRAINTPOSITION_VALUE] = value;
} }
/**/ /**/
@ -2420,11 +2420,11 @@ spPathConstraintSpacingTimeline* spPathConstraintSpacingTimeline_create (int fra
return timeline; return timeline;
} }
void spPathConstraintSpacingTimeline_setFrame (spPathConstraintSpacingTimeline* self, int frameIndex, float time, float value) { void spPathConstraintSpacingTimeline_setFrame (spPathConstraintSpacingTimeline* self, int frame, float time, float value) {
float *frames = self->super.super.frames->items; float *frames = self->super.super.frames->items;
frameIndex *= PATHCONSTRAINTSPACING_ENTRIES; frame *= PATHCONSTRAINTSPACING_ENTRIES;
frames[frameIndex] = time; frames[frame] = time;
frames[frameIndex + PATHCONSTRAINTSPACING_VALUE] = value; frames[frame + PATHCONSTRAINTSPACING_VALUE] = value;
} }
/**/ /**/
@ -2519,11 +2519,11 @@ spPathConstraintMixTimeline* spPathConstraintMixTimeline_create (int framesCount
return timeline; return timeline;
} }
void spPathConstraintMixTimeline_setFrame (spPathConstraintMixTimeline* self, int frameIndex, float time, float mixRotate, float mixX, float mixY) { void spPathConstraintMixTimeline_setFrame (spPathConstraintMixTimeline* self, int frame, float time, float mixRotate, float mixX, float mixY) {
float *frames = self->super.super.frames->items; float *frames = self->super.super.frames->items;
frameIndex *= PATHCONSTRAINTMIX_ENTRIES; frame *= PATHCONSTRAINTMIX_ENTRIES;
frames[frameIndex] = time; frames[frame] = time;
frames[frameIndex + PATHCONSTRAINTMIX_ROTATE] = mixRotate; frames[frame + PATHCONSTRAINTMIX_ROTATE] = mixRotate;
frames[frameIndex + PATHCONSTRAINTMIX_X] = mixX; frames[frame + PATHCONSTRAINTMIX_X] = mixX;
frames[frameIndex + PATHCONSTRAINTMIX_Y] = mixY; frames[frame + PATHCONSTRAINTMIX_Y] = mixY;
} }

8
spine-cpp/spine-cpp/src/spine/CurveTimeline.cpp
View File

@ -75,9 +75,9 @@ void CurveTimeline::setBezier (size_t bezier, size_t frame, float value, float t
} }
} }
float CurveTimeline::getBezierValue(float time, size_t frame, size_t valueOffset, size_t i) { float CurveTimeline::getBezierValue(float time, size_t frameIndex, size_t valueOffset, size_t i) {
if (_curves[i] > time) { if (_curves[i] > time) {
float x = _frames[frame], y = _frames[frame + valueOffset]; float x = _frames[frameIndex], y = _frames[frameIndex + valueOffset];
return y + (time - x) / (_curves[i] - x) * (_curves[i + 1] - y); return y + (time - x) / (_curves[i] - x) * (_curves[i + 1] - y);
} }
size_t n = i + BEZIER_SIZE; size_t n = i + BEZIER_SIZE;
@ -87,9 +87,9 @@ float CurveTimeline::getBezierValue(float time, size_t frame, size_t valueOffset
return y + (time - x) / (_curves[i] - x) * (_curves[i + 1] - y); return y + (time - x) / (_curves[i] - x) * (_curves[i + 1] - y);
} }
} }
frame += getFrameEntries(); frameIndex += getFrameEntries();
float x = _curves[n - 2], y = _curves[n - 1]; float x = _curves[n - 2], y = _curves[n - 1];
return y + (time - x) / (_frames[frame] - x) * (_frames[frame + valueOffset] - y); return y + (time - x) / (_frames[frameIndex] - x) * (_frames[frameIndex + valueOffset] - y);
} }
RTTI_IMPL(CurveTimeline1, CurveTimeline) RTTI_IMPL(CurveTimeline1, CurveTimeline)

8
spine-cpp/spine-cpp/src/spine/DeformTimeline.cpp
View File

@ -311,10 +311,10 @@ float DeformTimeline::getCurvePercent(float time, int frame) {
return y + (1 - y) * (time - x) / (_frames[frame + getFrameEntries()] - x); return y + (1 - y) * (time - x) / (_frames[frame + getFrameEntries()] - x);
} }
void DeformTimeline::setFrame(int frameIndex, float time, Vector<float> &vertices) { void DeformTimeline::setFrame(int frame, float time, Vector<float> &vertices) {
_frames[frameIndex] = time; _frames[frame] = time;
_vertices[frameIndex].clear(); _vertices[frame].clear();
_vertices[frameIndex].addAll(vertices); _vertices[frame].addAll(vertices);
} }
Vector<Vector<float> > &DeformTimeline::getVertices() { Vector<Vector<float> > &DeformTimeline::getVertices() {

12
spine-cpp/spine-cpp/src/spine/PathConstraintMixTimeline.cpp
View File

@ -120,10 +120,10 @@ void PathConstraintMixTimeline::apply(Skeleton &skeleton, float lastTime, float
} }
} }
void PathConstraintMixTimeline::setFrame(int frameIndex, float time, float mixRotate, float mixX, float mixY) { void PathConstraintMixTimeline::setFrame(int frame, float time, float mixRotate, float mixX, float mixY) {
frameIndex *= ENTRIES; frame *= ENTRIES;
_frames[frameIndex] = time; _frames[frame] = time;
_frames[frameIndex + ROTATE] = mixRotate; _frames[frame + ROTATE] = mixRotate;
_frames[frameIndex + X] = mixX; _frames[frame + X] = mixX;
_frames[frameIndex + Y] = mixY; _frames[frame + Y] = mixY;
} }

18
spine-cpp/spine-cpp/src/spine/TransformConstraintTimeline.cpp
View File

@ -144,13 +144,13 @@ void TransformConstraintTimeline::apply(Skeleton &skeleton, float lastTime, floa
} }
} }
void TransformConstraintTimeline::setFrame(size_t frameIndex, float time, float mixRotate, float mixX, float mixY, float mixScaleX, float mixScaleY, float mixShearY) { void TransformConstraintTimeline::setFrame(size_t frame, float time, float mixRotate, float mixX, float mixY, float mixScaleX, float mixScaleY, float mixShearY) {
frameIndex *= ENTRIES; frame *= ENTRIES;
_frames[frameIndex] = time; _frames[frame] = time;
_frames[frameIndex + ROTATE] = mixRotate; _frames[frame + ROTATE] = mixRotate;
_frames[frameIndex + X] = mixX; _frames[frame + X] = mixX;
_frames[frameIndex + Y] = mixY; _frames[frame + Y] = mixY;
_frames[frameIndex + SCALEX] = mixScaleX; _frames[frame + SCALEX] = mixScaleX;
_frames[frameIndex + SCALEY] = mixScaleY; _frames[frame + SCALEY] = mixScaleY;
_frames[frameIndex + SHEARY] = mixShearY; _frames[frame + SHEARY] = mixShearY;
} }