UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

[godot] Fix handling of CJK in names, see #2788

Browse Source
This commit is contained in:
Mario Zechner 2025-04-18 14:33:10 +02:00
parent b3bcbfa3c6
commit 88f69fb2a6
3 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
spine-godot/spine_godot/SpineSkeletonDataResource.cpp
View File

@ -381,11 +381,9 @@ SpineSkeletonDataResource::get_skeleton_file_res() {
} }
#ifdef SPINE_GODOT_EXTENSION #ifdef SPINE_GODOT_EXTENSION
void SpineSkeletonDataResource::get_animation_names( void SpineSkeletonDataResource::get_animation_names(PackedStringArray &animation_names) const {
PackedStringArray &animation_names) const {
#else #else
void SpineSkeletonDataResource::get_animation_names( void SpineSkeletonDataResource::get_animation_names(Vector<String> &animation_names) const {
Vector<String> &animation_names) const {
#endif #endif
animation_names.clear(); animation_names.clear();
if (!is_skeleton_data_loaded()) if (!is_skeleton_data_loaded())
@ -393,16 +391,16 @@ void SpineSkeletonDataResource::get_animation_names(
auto animations = skeleton_data->getAnimations(); auto animations = skeleton_data->getAnimations();
for (size_t i = 0; i < animations.size(); ++i) { for (size_t i = 0; i < animations.size(); ++i) {
auto animation = animations[i]; auto animation = animations[i];
animation_names.push_back(animation->getName().buffer()); String name;
name.parse_utf8(animation->getName().buffer());
animation_names.push_back(name);
} }
} }
#ifdef SPINE_GODOT_EXTENSION #ifdef SPINE_GODOT_EXTENSION
void SpineSkeletonDataResource::get_skin_names( void SpineSkeletonDataResource::get_skin_names(PackedStringArray &skin_names) const {
PackedStringArray &skin_names) const {
#else #else
void SpineSkeletonDataResource::get_skin_names( void SpineSkeletonDataResource::get_skin_names(Vector<String> &skin_names) const {
Vector<String> &skin_names) const {
#endif #endif
skin_names.clear(); skin_names.clear();
if (!is_skeleton_data_loaded()) if (!is_skeleton_data_loaded())
@ -410,7 +408,9 @@ void SpineSkeletonDataResource::get_skin_names(
auto skins = skeleton_data->getSkins(); auto skins = skeleton_data->getSkins();
for (size_t i = 0; i < skins.size(); ++i) { for (size_t i = 0; i < skins.size(); ++i) {
auto skin = skins[i]; auto skin = skins[i];
skin_names.push_back(skin->getName().buffer()); String name;
name.parse_utf8(skin->getName().buffer());
skin_names.push_back(name);
} }
} }
@ -425,7 +425,9 @@ void SpineSkeletonDataResource::get_slot_names(Vector<String> &slot_names) {
auto slots = skeleton_data->getSlots(); auto slots = skeleton_data->getSlots();
for (size_t i = 0; i < slots.size(); ++i) { for (size_t i = 0; i < slots.size(); ++i) {
auto slot = slots[i]; auto slot = slots[i];
slot_names.push_back(slot->getName().buffer()); String name;
name.parse_utf8(slot->getName().buffer());
slot_names.push_back(name);
} }
} }
@ -440,7 +442,9 @@ void SpineSkeletonDataResource::get_bone_names(Vector<String> &bone_names) {
auto bones = skeleton_data->getBones(); auto bones = skeleton_data->getBones();
for (size_t i = 0; i < bones.size(); ++i) { for (size_t i = 0; i < bones.size(); ++i) {
auto bone = bones[i]; auto bone = bones[i];
bone_names.push_back(bone->getName().buffer()); String name;
name.parse_utf8(bone->getName().buffer());
bone_names.push_back(name);
} }
} }

2
spine-ue/Plugins/SpinePlugin/Source/SpinePlugin/Private/SpineSkeletonAnimationComponent.cpp
View File

@ -81,7 +81,7 @@ USpineSkeletonAnimationComponent::USpineSkeletonAnimationComponent() {
void USpineSkeletonAnimationComponent::BeginPlay() { void USpineSkeletonAnimationComponent::BeginPlay() {
Super::BeginPlay(); Super::BeginPlay();
for (UTrackEntry* entry : trackEntries) { for (UTrackEntry *entry : trackEntries) {
if (entry && entry->GetTrackEntry()) { if (entry && entry->GetTrackEntry()) {
entry->GetTrackEntry()->setRendererObject(nullptr); entry->GetTrackEntry()->setRendererObject(nullptr);
} }

2
spine-ue/Plugins/SpinePlugin/Source/SpinePlugin/Private/SpineWidget.cpp
View File

@ -108,7 +108,7 @@ void USpineWidget::SynchronizeProperties() {
} else { } else {
slateWidget->SetData(nullptr); slateWidget->SetData(nullptr);
} }
for (UTrackEntry* entry : trackEntries) { for (UTrackEntry *entry : trackEntries) {
if (entry && entry->GetTrackEntry()) { if (entry && entry->GetTrackEntry()) {
entry->GetTrackEntry()->setRendererObject(nullptr); entry->GetTrackEntry()->setRendererObject(nullptr);
} }