mirror of
https://github.com/EsotericSoftware/spine-runtimes.git
synced 2025-12-21 01:36:02 +08:00
Merge branch '3.7-beta' into 3.7-beta-cpp
This commit is contained in:
commit
d361f45971
@ -46,25 +46,25 @@ void callback (AnimationState* state, EventType type, TrackEntry* entry, Event*
|
|||||||
const String& animationName = (entry && entry->getAnimation()) ? entry->getAnimation()->getName() : String("");
|
const String& animationName = (entry && entry->getAnimation()) ? entry->getAnimation()->getName() : String("");
|
||||||
|
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case EventType_Start:
|
case EventType_Start:
|
||||||
printf("%d start: %s\n", entry->getTrackIndex(), animationName.buffer());
|
printf("%d start: %s\n", entry->getTrackIndex(), animationName.buffer());
|
||||||
break;
|
break;
|
||||||
case EventType_Interrupt:
|
case EventType_Interrupt:
|
||||||
printf("%d interrupt: %s\n", entry->getTrackIndex(), animationName.buffer());
|
printf("%d interrupt: %s\n", entry->getTrackIndex(), animationName.buffer());
|
||||||
break;
|
break;
|
||||||
case EventType_End:
|
case EventType_End:
|
||||||
printf("%d end: %s\n", entry->getTrackIndex(), animationName.buffer());
|
printf("%d end: %s\n", entry->getTrackIndex(), animationName.buffer());
|
||||||
break;
|
break;
|
||||||
case EventType_Complete:
|
case EventType_Complete:
|
||||||
printf("%d complete: %s\n", entry->getTrackIndex(), animationName.buffer());
|
printf("%d complete: %s\n", entry->getTrackIndex(), animationName.buffer());
|
||||||
break;
|
break;
|
||||||
case EventType_Dispose:
|
case EventType_Dispose:
|
||||||
printf("%d dispose: %s\n", entry->getTrackIndex(), animationName.buffer());
|
printf("%d dispose: %s\n", entry->getTrackIndex(), animationName.buffer());
|
||||||
break;
|
break;
|
||||||
case EventType_Event:
|
case EventType_Event:
|
||||||
printf("%d event: %s, %s: %d, %f, %s %f %f\n", entry->getTrackIndex(), animationName.buffer(), event->getData().getName().buffer(), event->getIntValue(), event->getFloatValue(),
|
printf("%d event: %s, %s: %d, %f, %s %f %f\n", entry->getTrackIndex(), animationName.buffer(), event->getData().getName().buffer(), event->getIntValue(), event->getFloatValue(),
|
||||||
event->getStringValue().buffer(), event->getVolume(), event->getBalance());
|
event->getStringValue().buffer(), event->getVolume(), event->getBalance());
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
fflush(stdout);
|
fflush(stdout);
|
||||||
}
|
}
|
||||||
@ -92,8 +92,8 @@ shared_ptr<SkeletonData> readSkeletonBinaryData (const char* filename, Atlas* at
|
|||||||
}
|
}
|
||||||
|
|
||||||
void testcase (void func(SkeletonData* skeletonData, Atlas* atlas),
|
void testcase (void func(SkeletonData* skeletonData, Atlas* atlas),
|
||||||
const char* jsonName, const char* binaryName, const char* atlasName,
|
const char* jsonName, const char* binaryName, const char* atlasName,
|
||||||
float scale) {
|
float scale) {
|
||||||
SFMLTextureLoader textureLoader;
|
SFMLTextureLoader textureLoader;
|
||||||
auto atlas = make_unique<Atlas>(atlasName, &textureLoader);
|
auto atlas = make_unique<Atlas>(atlasName, &textureLoader);
|
||||||
|
|
||||||
@ -474,4 +474,4 @@ int main () {
|
|||||||
|
|
||||||
dbgExtension.reportLeaks();
|
dbgExtension.reportLeaks();
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -80,4 +80,4 @@ public:
|
|||||||
};
|
};
|
||||||
|
|
||||||
} /* namespace spine */
|
} /* namespace spine */
|
||||||
#endif /* SPINE_SFML_H_ */
|
#endif /* SPINE_SFML_H_ */
|
||||||
Loading…
x
Reference in New Issue
Block a user