Skip to content

Commit be2e8ff

Browse files
committed
Formatting
1 parent fba6444 commit be2e8ff

File tree

5 files changed

+31
-23
lines changed

5 files changed

+31
-23
lines changed

Package.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ let package = Package(
3232
.target(
3333
name: "SpineiOSWrapper",
3434
dependencies: [
35-
.target(name: "SpineiOS", condition: .when(platforms: [.iOS, .visionOS, .tvOS, .macCatalyst ]))
35+
.target(name: "SpineiOS", condition: .when(platforms: [.iOS, .visionOS, .tvOS, .macCatalyst]))
3636
],
3737
path: "spine-ios/Sources/SpineiOSWrapper"
3838
),
@@ -49,7 +49,7 @@ let package = Package(
4949
path: "spine-ios/Sources/SpineC",
5050
sources: [
5151
"src",
52-
"spine"
52+
"spine",
5353
],
5454
linkerSettings: [
5555
.linkedLibrary("c++")

spine-android/spine-android/src/main/java/com/esotericsoftware/spine/android/SpineView.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -352,10 +352,10 @@ public void setRendering (Boolean rendering) {
352352
this.rendering = rendering;
353353
}
354354

355-
/** Load the skeleton from a {@link AndroidSkeletonDrawableLoader}. This method is asynchronous.
356-
* If you want to control the loading thread yourself, obtain an {@link AndroidSkeletonDrawable}
357-
* using {@link AndroidSkeletonDrawable#fromHttp(URL, URL, File)} or another load method,
358-
* then call {@link SpineView#loadFromDrawable(AndroidSkeletonDrawable)} or
355+
/** Load the skeleton from a {@link AndroidSkeletonDrawableLoader}. This method is asynchronous. If you want to control the
356+
* loading thread yourself, obtain an {@link AndroidSkeletonDrawable} using
357+
* {@link AndroidSkeletonDrawable#fromHttp(URL, URL, File)} or another load method, then call
358+
* {@link SpineView#loadFromDrawable(AndroidSkeletonDrawable)} or
359359
* {@link SpineView#setSkeletonDrawable(AndroidSkeletonDrawable)}. */
360360
public void loadFrom (AndroidSkeletonDrawableLoader loader) {
361361
Handler mainHandler = new Handler(Looper.getMainLooper());
@@ -365,14 +365,14 @@ public void loadFrom (AndroidSkeletonDrawableLoader loader) {
365365
mainHandler.post( () -> {
366366
setSkeletonDrawable(skeletonDrawable);
367367
});
368-
}catch (Exception e) {
368+
} catch (Exception e) {
369369
Log.e("SpineView", "Error loading skeleton", e);
370370
}
371371
});
372372
backgroundThread.start();
373373
}
374374

375-
/** Set the skeleton drawable. Must be called from the main thread.*/
375+
/** Set the skeleton drawable. Must be called from the main thread. */
376376
@MainThread
377377
public final void setSkeletonDrawable (@NonNull AndroidSkeletonDrawable skeletonDrawable) {
378378
computedBounds = boundsProvider.computeBounds(skeletonDrawable);

spine-flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,5 @@
55
import FlutterMacOS
66
import Foundation
77

8-
98
func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
109
}

spine-godot/spine_godot/register_types.cpp

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,26 @@ void initialize_spine_godot_module(ModuleInitializationLevel level) {
101101
GDREGISTER_CLASS(SpineEditorPlugin);
102102
EditorPlugins::add_plugin_class(StringName("SpineEditorPlugin"));
103103
#endif
104+
return;
105+
}
106+
if (level == MODULE_INITIALIZATION_LEVEL_CORE) {
107+
GDREGISTER_CLASS(SpineAtlasResourceFormatLoader);
108+
GDREGISTER_CLASS(SpineAtlasResourceFormatSaver);
109+
GDREGISTER_CLASS(SpineSkeletonFileResourceFormatLoader);
110+
GDREGISTER_CLASS(SpineSkeletonFileResourceFormatSaver);
111+
112+
atlas_loader = memnew(SpineAtlasResourceFormatLoader);
113+
ResourceLoader::get_singleton()->add_resource_format_loader(atlas_loader);
114+
115+
atlas_saver = memnew(SpineAtlasResourceFormatSaver);
116+
ResourceSaver::get_singleton()->add_resource_format_saver(atlas_saver);
117+
118+
skeleton_file_loader = memnew(SpineSkeletonFileResourceFormatLoader);
119+
ResourceLoader::get_singleton()->add_resource_format_loader(skeleton_file_loader);
120+
121+
skeleton_file_saver = memnew(SpineSkeletonFileResourceFormatSaver);
122+
ResourceSaver::get_singleton()->add_resource_format_saver(skeleton_file_saver);
123+
return;
104124
}
105125
if (level != MODULE_INITIALIZATION_LEVEL_SCENE) return;
106126
#else
@@ -124,10 +144,12 @@ void register_spine_godot_types() {
124144
#endif
125145
spine::Bone::setYDown(true);
126146

147+
#ifndef SPINE_GODOT_EXTENSION
127148
GDREGISTER_CLASS(SpineAtlasResourceFormatLoader);
128149
GDREGISTER_CLASS(SpineAtlasResourceFormatSaver);
129150
GDREGISTER_CLASS(SpineSkeletonFileResourceFormatLoader);
130151
GDREGISTER_CLASS(SpineSkeletonFileResourceFormatSaver);
152+
#endif
131153

132154
GDREGISTER_CLASS(SpineObjectWrapper);
133155
GDREGISTER_CLASS(SpineAtlasResource);
@@ -177,19 +199,7 @@ void register_spine_godot_types() {
177199
GDREGISTER_CLASS(SpineAnimationTrack);
178200
#endif
179201

180-
#ifdef SPINE_GODOT_EXTENSION
181-
atlas_loader = memnew(SpineAtlasResourceFormatLoader);
182-
ResourceLoader::get_singleton()->add_resource_format_loader(atlas_loader);
183-
184-
atlas_saver = memnew(SpineAtlasResourceFormatSaver);
185-
ResourceSaver::get_singleton()->add_resource_format_saver(atlas_saver);
186-
187-
skeleton_file_loader = memnew(SpineSkeletonFileResourceFormatLoader);
188-
ResourceLoader::get_singleton()->add_resource_format_loader(skeleton_file_loader);
189-
190-
skeleton_file_saver = memnew(SpineSkeletonFileResourceFormatSaver);
191-
ResourceSaver::get_singleton()->add_resource_format_saver(skeleton_file_saver);
192-
#else
202+
#ifndef SPINE_GODOT_EXTENSION
193203
#if VERSION_MAJOR > 3
194204
atlas_loader = memnew(SpineAtlasResourceFormatLoader);
195205
ResourceLoader::add_resource_format_loader(atlas_loader);

spine-ios/Sources/SpineiOSWrapper/stub.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,3 @@
44
//
55
// Created by pbk20191 on 11/7/25.
66
//
7-

0 commit comments

Comments
 (0)