mirror of
https://github.com/EsotericSoftware/spine-runtimes.git
synced 2025-12-22 02:06:03 +08:00
[c] Corrects RGBA2 to RGB2
This commit is contained in:
parent
1353274eca
commit
249df20753
@ -426,7 +426,7 @@ static spAnimation *_spSkeletonJson_readAnimation(spSkeletonJson *self, Json *ro
|
|||||||
spTimelineArray_add(timelines, SUPER(SUPER(timeline)));
|
spTimelineArray_add(timelines, SUPER(SUPER(timeline)));
|
||||||
} else if (strcmp(timelineMap->name, "rgb2") == 0) {
|
} else if (strcmp(timelineMap->name, "rgb2") == 0) {
|
||||||
float time;
|
float time;
|
||||||
spRGBA2Timeline *timeline = spRGBA2Timeline_create(frames, frames * 6, slotIndex);
|
spRGB2Timeline *timeline = spRGB2Timeline_create(frames, frames * 6, slotIndex);
|
||||||
keyMap = timelineMap->child;
|
keyMap = timelineMap->child;
|
||||||
time = Json_getFloat(keyMap, "time", 0);
|
time = Json_getFloat(keyMap, "time", 0);
|
||||||
toColor2(&color, Json_getString(keyMap, "light", 0), 0);
|
toColor2(&color, Json_getString(keyMap, "light", 0), 0);
|
||||||
@ -434,8 +434,8 @@ static spAnimation *_spSkeletonJson_readAnimation(spSkeletonJson *self, Json *ro
|
|||||||
|
|
||||||
for (frame = 0, bezier = 0;; ++frame) {
|
for (frame = 0, bezier = 0;; ++frame) {
|
||||||
float time2;
|
float time2;
|
||||||
spRGBA2Timeline_setFrame(timeline, frame, time, color.r, color.g, color.b, color.a, color2.r,
|
spRGB2Timeline_setFrame(timeline, frame, time, color.r, color.g, color.b, color2.r, color2.g,
|
||||||
color2.g, color2.b);
|
color2.b);
|
||||||
nextMap = keyMap->next;
|
nextMap = keyMap->next;
|
||||||
if (!nextMap) {
|
if (!nextMap) {
|
||||||
/* timeline.shrink(); // BOZO */
|
/* timeline.shrink(); // BOZO */
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user