From 3acbc2ab7a3adea07fe5e48c394bc2fecddb9b48 Mon Sep 17 00:00:00 2001 From: Mario Zechner Date: Tue, 5 Sep 2023 22:36:04 +0200 Subject: [PATCH] Formatting --- spine-godot/spine_godot/SpineSkeleton.cpp | 4 ++-- spine-godot/spine_godot/SpineSkeleton.h | 4 ++-- spine-godot/spine_godot/SpineSlot.cpp | 10 ++++------ spine-ts/spine-phaser/src/SpinePlugin.ts | 2 +- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/spine-godot/spine_godot/SpineSkeleton.cpp b/spine-godot/spine_godot/SpineSkeleton.cpp index 9685d3456..ffbcbb40a 100644 --- a/spine-godot/spine_godot/SpineSkeleton.cpp +++ b/spine-godot/spine_godot/SpineSkeleton.cpp @@ -115,7 +115,7 @@ Ref SpineSkeleton::find_bone(const String &name) { if (EMPTY(name)) return nullptr; auto bone = skeleton->findBone(SPINE_STRING_TMP(name)); if (!bone) return nullptr; - if (_cached_bones.count(bone) > 0 ) { + if (_cached_bones.count(bone) > 0) { return _cached_bones[bone]; } Ref bone_ref(memnew(SpineBone)); @@ -129,7 +129,7 @@ Ref SpineSkeleton::find_slot(const String &name) { if (EMPTY(name)) return nullptr; auto slot = skeleton->findSlot(SPINE_STRING_TMP(name)); if (!slot) return nullptr; - if (_cached_slots.count(slot) > 0 ) { + if (_cached_slots.count(slot) > 0) { return _cached_slots[slot]; } Ref slot_ref(memnew(SpineSlot)); diff --git a/spine-godot/spine_godot/SpineSkeleton.h b/spine-godot/spine_godot/SpineSkeleton.h index 19256d5d5..2d479177e 100644 --- a/spine-godot/spine_godot/SpineSkeleton.h +++ b/spine-godot/spine_godot/SpineSkeleton.h @@ -68,8 +68,8 @@ private: spine::Vector bounds_vertex_buffer; Ref last_skin; - std::unordered_map> _cached_bones; - std::unordered_map> _cached_slots; + std::unordered_map> _cached_bones; + std::unordered_map> _cached_slots; public: SpineSkeleton(); diff --git a/spine-godot/spine_godot/SpineSlot.cpp b/spine-godot/spine_godot/SpineSlot.cpp index 71c9fdfa4..067efe269 100644 --- a/spine-godot/spine_godot/SpineSlot.cpp +++ b/spine-godot/spine_godot/SpineSlot.cpp @@ -59,10 +59,9 @@ void SpineSlot::set_to_setup_pose() { Ref SpineSlot::get_data() { SPINE_CHECK(get_spine_object(), nullptr) - if(_data.is_valid()) { + if (_data.is_valid()) { return _data; - } - else { + } else { auto &slot_data = get_spine_object()->getData(); Ref slot_data_ref(memnew(SpineSlotData)); slot_data_ref->set_spine_object(*get_spine_owner()->get_skeleton_data_res(), &slot_data); @@ -73,10 +72,9 @@ Ref SpineSlot::get_data() { Ref SpineSlot::get_bone() { SPINE_CHECK(get_spine_object(), nullptr) - if(_bone.is_valid()) { + if (_bone.is_valid()) { return _data; - } - else { + } else { auto &bone = get_spine_object()->getBone(); Ref bone_ref(memnew(SpineBone)); bone_ref->set_spine_object(get_spine_owner(), &bone); diff --git a/spine-ts/spine-phaser/src/SpinePlugin.ts b/spine-ts/spine-phaser/src/SpinePlugin.ts index ad28c6c7d..951bc2021 100644 --- a/spine-ts/spine-phaser/src/SpinePlugin.ts +++ b/spine-ts/spine-phaser/src/SpinePlugin.ts @@ -76,7 +76,7 @@ export class SpinePlugin extends Phaser.Plugins.ScenePlugin { private isWebGL: boolean; gl: WebGLRenderingContext | null; static gameWebGLRenderer: SceneRenderer | null = null; - get webGLRenderer(): SceneRenderer | null { + get webGLRenderer (): SceneRenderer | null { return SpinePlugin.gameWebGLRenderer; } canvasRenderer: SkeletonRenderer | null;