UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-20 17:26:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.7-beta' into 3.7-beta-cpp

Browse Source
This commit is contained in:
badlogic 2018-10-15 13:57:11 +02:00
commit d361f45971
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
spine-sfml/cpp/example/main.cpp
View File

@ -46,25 +46,25 @@ void callback (AnimationState* state, EventType type, TrackEntry* entry, Event*
const String& animationName = (entry && entry->getAnimation()) ? entry->getAnimation()->getName() : String("");
switch (type) {
case EventType_Start:
printf("%d start: %s\n", entry->getTrackIndex(), animationName.buffer());
break;
case EventType_Interrupt:
printf("%d interrupt: %s\n", entry->getTrackIndex(), animationName.buffer());
break;
case EventType_End:
printf("%d end: %s\n", entry->getTrackIndex(), animationName.buffer());
break;
case EventType_Complete:
printf("%d complete: %s\n", entry->getTrackIndex(), animationName.buffer());
break;
case EventType_Dispose:
printf("%d dispose: %s\n", entry->getTrackIndex(), animationName.buffer());
break;
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(),
event->getStringValue().buffer(), event->getVolume(), event->getBalance());
break;
case EventType_Start:
printf("%d start: %s\n", entry->getTrackIndex(), animationName.buffer());
break;
case EventType_Interrupt:
printf("%d interrupt: %s\n", entry->getTrackIndex(), animationName.buffer());
break;
case EventType_End:
printf("%d end: %s\n", entry->getTrackIndex(), animationName.buffer());
break;
case EventType_Complete:
printf("%d complete: %s\n", entry->getTrackIndex(), animationName.buffer());
break;
case EventType_Dispose:
printf("%d dispose: %s\n", entry->getTrackIndex(), animationName.buffer());
break;
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(),
event->getStringValue().buffer(), event->getVolume(), event->getBalance());
break;
}
fflush(stdout);
}
@ -92,8 +92,8 @@ shared_ptr<SkeletonData> readSkeletonBinaryData (const char* filename, Atlas* at
}
void testcase (void func(SkeletonData* skeletonData, Atlas* atlas),
const char* jsonName, const char* binaryName, const char* atlasName,
float scale) {
const char* jsonName, const char* binaryName, const char* atlasName,
float scale) {
SFMLTextureLoader textureLoader;
auto atlas = make_unique<Atlas>(atlasName, &textureLoader);
@ -474,4 +474,4 @@ int main () {
dbgExtension.reportLeaks();
return 0;
}
}

2
spine-sfml/cpp/src/spine/spine-sfml.h
View File

@ -80,4 +80,4 @@ public:
};
} /* namespace spine */
#endif /* SPINE_SFML_H_ */
#endif /* SPINE_SFML_H_ */