Skip to content

Commit e9ecd36

Browse files
committed
[godot] Fix type registration, extension example assets
1 parent 82e54c3 commit e9ecd36

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+7435
-7150
lines changed

spine-godot/SConstruct

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,30 +85,40 @@ sources.append("spine_godot/SpineAtlasResource.cpp")
8585
sources.append("spine_godot/SpineAttachment.cpp")
8686
sources.append("spine_godot/SpineBone.cpp")
8787
sources.append("spine_godot/SpineBoneData.cpp")
88+
sources.append("spine_godot/SpineBoneLocal.cpp")
8889
sources.append("spine_godot/SpineBoneNode.cpp")
90+
sources.append("spine_godot/SpineBonePose.cpp")
8991
sources.append("spine_godot/SpineConstant.cpp")
9092
sources.append("spine_godot/SpineConstraintData.cpp")
9193
sources.append("spine_godot/SpineEditorPlugin.cpp")
9294
sources.append("spine_godot/SpineEvent.cpp")
9395
sources.append("spine_godot/SpineEventData.cpp")
9496
sources.append("spine_godot/SpineIkConstraint.cpp")
9597
sources.append("spine_godot/SpineIkConstraintData.cpp")
98+
sources.append("spine_godot/SpineIkConstraintPose.cpp")
9699
sources.append("spine_godot/SpinePathConstraint.cpp")
97100
sources.append("spine_godot/SpinePathConstraintData.cpp")
101+
sources.append("spine_godot/SpinePathConstraintPose.cpp")
98102
sources.append("spine_godot/SpinePhysicsConstraint.cpp")
99103
sources.append("spine_godot/SpinePhysicsConstraintData.cpp")
104+
sources.append("spine_godot/SpinePhysicsConstraintPose.cpp")
100105
sources.append("spine_godot/SpineSkeleton.cpp")
101106
sources.append("spine_godot/SpineSkeletonDataResource.cpp")
102107
sources.append("spine_godot/SpineSkeletonFileResource.cpp")
103108
sources.append("spine_godot/SpineSkin.cpp")
109+
sources.append("spine_godot/SpineSlider.cpp")
110+
sources.append("spine_godot/SpineSliderData.cpp")
111+
sources.append("spine_godot/SpineSliderPose.cpp")
104112
sources.append("spine_godot/SpineSlot.cpp")
105113
sources.append("spine_godot/SpineSlotData.cpp")
106114
sources.append("spine_godot/SpineSlotNode.cpp")
115+
sources.append("spine_godot/SpineSlotPose.cpp")
107116
sources.append("spine_godot/SpineSprite.cpp")
108117
sources.append("spine_godot/SpineTimeline.cpp")
109118
sources.append("spine_godot/SpineTrackEntry.cpp")
110119
sources.append("spine_godot/SpineTransformConstraint.cpp")
111120
sources.append("spine_godot/SpineTransformConstraintData.cpp")
121+
sources.append("spine_godot/SpineTransformConstraintPose.cpp")
112122
sources.append("spine_godot/register_types.cpp")
113123

114124
if env["target"] in ["editor", "template_debug"]:

spine-godot/example-v4-extension/assets/celestial-circus/celestial-circus.atlas

Lines changed: 82 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -3,171 +3,155 @@ celestial-circus.png
33
filter: Linear, Linear
44
scale: 0.4
55
arm-back-down
6-
bounds: 324, 401, 38, 82
7-
rotate: 90
6+
bounds: 971, 683, 38, 82
87
arm-back-up
9-
bounds: 290, 44, 83, 116
10-
rotate: 90
8+
bounds: 939, 44, 83, 116
119
arm-front-down
12-
bounds: 706, 2, 36, 78
13-
rotate: 90
10+
bounds: 971, 603, 36, 78
1411
arm-front-up
15-
bounds: 860, 138, 77, 116
12+
bounds: 289, 22, 77, 116
13+
rotate: 90
1614
bench
17-
bounds: 725, 256, 189, 48
15+
bounds: 586, 47, 189, 48
1816
body-bottom
19-
bounds: 879, 868, 154, 124
20-
rotate: 90
17+
bounds: 868, 270, 154, 124
2118
body-top
22-
bounds: 725, 128, 126, 133
19+
bounds: 2, 156, 126, 132
20+
offsets: 0, 0, 126, 133
2321
rotate: 90
2422
chest
25-
bounds: 408, 26, 104, 93
23+
bounds: 490, 267, 104, 93
24+
rotate: 180
2625
cloud-back
27-
bounds: 752, 378, 202, 165
28-
cloud-front
29-
bounds: 2, 2, 325, 196
26+
bounds: 804, 563, 202, 165
3027
rotate: 90
28+
cloud-front
29+
bounds: 606, 440, 325, 196
30+
rotate: 270
3131
collar
32-
bounds: 786, 13, 47, 26
32+
bounds: 373, 739, 47, 26
3333
ear
34-
bounds: 1002, 643, 20, 28
34+
bounds: 106, 737, 20, 28
3535
eye-back-shadow
36-
bounds: 428, 395, 14, 10
36+
bounds: 233, 755, 14, 10
3737
eye-front-shadow
38-
bounds: 704, 529, 24, 14
38+
bounds: 128, 751, 24, 14
3939
eye-reflex-back
40-
bounds: 860, 128, 8, 7
41-
rotate: 90
40+
bounds: 787, 758, 8, 7
4241
eye-reflex-front
43-
bounds: 726, 386, 10, 7
42+
bounds: 154, 758, 10, 7
4443
eye-white-back
45-
bounds: 835, 23, 13, 16
44+
bounds: 616, 749, 13, 16
4645
eye-white-front
47-
bounds: 1005, 1000, 22, 17
48-
rotate: 90
46+
bounds: 477, 748, 22, 17
4947
eyelashes-down-back
50-
bounds: 232, 329, 11, 6
51-
rotate: 90
48+
bounds: 655, 759, 11, 6
5249
eyelashes-down-front
53-
bounds: 913, 851, 15, 6
54-
rotate: 90
50+
bounds: 549, 759, 15, 6
5551
eyelashes-top-back
56-
bounds: 408, 395, 18, 10
52+
bounds: 353, 755, 18, 10
5753
eyelashes-top-front
58-
bounds: 702, 179, 30, 16
59-
rotate: 90
54+
bounds: 749, 749, 30, 16
6055
face
61-
bounds: 514, 26, 93, 102
62-
rotate: 90
56+
bounds: 775, 277, 91, 102
57+
offsets: 2, 0, 93, 102
6358
feathers-back
64-
bounds: 954, 625, 46, 46
59+
bounds: 192, 611, 46, 46
6560
feathers-front
66-
bounds: 706, 40, 72, 86
61+
bounds: 415, 679, 72, 86
6762
fringe-middle-back
68-
bounds: 200, 6, 33, 52
69-
rotate: 90
63+
bounds: 794, 509, 33, 52
7064
fringe-middle-front
71-
bounds: 878, 76, 60, 50
72-
rotate: 90
65+
bounds: 679, 202, 60, 50
7366
fringe-side-back
74-
bounds: 780, 41, 27, 94
75-
rotate: 90
67+
bounds: 407, 5, 27, 94
7668
fringe-side-front
77-
bounds: 939, 161, 26, 93
69+
bounds: 14, 331, 26, 93
7870
glove-bottom-back
79-
bounds: 954, 572, 51, 41
80-
rotate: 90
71+
bounds: 14, 681, 51, 41
8172
glove-bottom-front
82-
bounds: 916, 256, 47, 48
73+
bounds: 313, 288, 47, 48
8374
hair-back-1
84-
bounds: 444, 395, 132, 306
85-
rotate: 90
75+
bounds: 716, 91, 132, 306
76+
rotate: 270
8677
hair-back-2
87-
bounds: 438, 211, 80, 285
78+
bounds: 124, 100, 80, 285
8879
rotate: 90
8980
hair-back-3
90-
bounds: 719, 306, 70, 268
91-
rotate: 90
81+
bounds: 410, 78, 70, 268
82+
rotate: 270
9283
hair-back-4
93-
bounds: 438, 121, 88, 262
84+
bounds: 42, 250, 88, 262
9485
rotate: 90
9586
hair-back-5
96-
bounds: 438, 293, 88, 279
87+
bounds: 320, 141, 88, 279
9788
rotate: 90
9889
hair-back-6
99-
bounds: 200, 41, 88, 286
90+
bounds: 2, 36, 88, 286
91+
rotate: 90
10092
hair-hat-shadow
101-
bounds: 232, 398, 90, 41
93+
bounds: 14, 724, 90, 41
10294
hand-back
103-
bounds: 954, 673, 60, 47
104-
rotate: 90
95+
bounds: 2, 42, 60, 47
10596
hand-front
106-
bounds: 967, 172, 53, 60
97+
bounds: 909, 208, 53, 60
10798
hat-back
108-
bounds: 954, 802, 64, 45
109-
rotate: 90
99+
bounds: 741, 189, 64, 45
110100
hat-front
111-
bounds: 780, 70, 96, 56
101+
bounds: 926, 396, 96, 56
112102
head-back
113-
bounds: 618, 17, 102, 86
114-
rotate: 90
103+
bounds: 777, 2, 102, 86
115104
jabot
116-
bounds: 967, 234, 70, 55
117-
rotate: 90
105+
bounds: 692, 384, 70, 55
118106
leg-back
119-
bounds: 232, 441, 210, 333
107+
bounds: 362, 164, 210, 333
108+
rotate: 90
120109
leg-front
121-
bounds: 444, 529, 258, 320
110+
bounds: 590, 181, 258, 320
111+
rotate: 90
122112
logo-brooch
123-
bounds: 954, 545, 16, 25
113+
bounds: 584, 740, 16, 25
124114
mouth
125-
bounds: 408, 121, 22, 6
115+
bounds: 631, 759, 22, 6
126116
neck
127-
bounds: 232, 342, 39, 56
128-
rotate: 90
117+
bounds: 597, 441, 39, 56
129118
nose
130-
bounds: 742, 529, 6, 7
131-
rotate: 90
119+
bounds: 556, 750, 6, 7
132120
nose-highlight
133-
bounds: 719, 300, 4, 4
121+
bounds: 166, 761, 4, 4
134122
nose-shadow
135-
bounds: 869, 128, 7, 8
123+
bounds: 778, 757, 7, 8
136124
pupil-back
137-
bounds: 730, 529, 10, 14
125+
bounds: 442, 751, 10, 14
138126
pupil-front
139-
bounds: 254, 21, 12, 18
127+
bounds: 602, 747, 12, 18
140128
rope-back
141-
bounds: 232, 383, 10, 492
142-
rotate: 90
129+
bounds: 2, 273, 10, 492
143130
rope-front
144-
bounds: 232, 383, 10, 492
145-
rotate: 90
131+
bounds: 2, 273, 10, 492
146132
rope-front-bottom
147-
bounds: 954, 735, 42, 65
133+
bounds: 895, 69, 42, 65
148134
skirt
149-
bounds: 2, 776, 440, 246
135+
bounds: 14, 325, 440, 246
136+
rotate: 90
150137
sock-bow
151-
bounds: 408, 407, 33, 32
138+
bounds: 253, 733, 33, 32
152139
spine-logo-body
153-
bounds: 879, 853, 13, 32
154-
rotate: 90
140+
bounds: 569, 733, 13, 32
155141
star-big
156-
bounds: 939, 141, 18, 24
157-
rotate: 90
142+
bounds: 422, 741, 18, 24
158143
star-medium
159-
bounds: 742, 537, 6, 8
160-
rotate: 90
144+
bounds: 1011, 757, 6, 8
161145
star-small
162-
bounds: 719, 378, 3, 4
163-
rotate: 90
146+
bounds: 218, 761, 3, 4
164147
underskirt
165-
bounds: 2, 329, 445, 228
166-
rotate: 90
148+
bounds: 212, 320, 445, 228
149+
rotate: 270
167150
underskirt-back
168-
bounds: 444, 851, 433, 171
151+
bounds: 434, 332, 433, 171
152+
rotate: 270
169153
wing-back
170-
bounds: 290, 129, 146, 252
154+
bounds: 137, 137, 146, 252
155+
rotate: 270
171156
wing-front
172-
bounds: 704, 545, 304, 248
173-
rotate: 90
157+
bounds: 718, 314, 304, 248

spine-godot/example-v4-extension/assets/celestial-circus/celestial-circus.atlas.import

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ dest_files=["res://.godot/imported/celestial-circus.atlas-8277f39286d729eed930dc
1313
[params]
1414

1515
normal_map_prefix="n"
16+
specular_map_prefix="s"
-10.4 KB
Loading

spine-godot/example-v4-extension/assets/celestial-circus/celestial-circus.png.import

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,19 @@ dest_files=["res://.godot/imported/celestial-circus.png-362082edc9ee92c57423ee44
1818
compress/mode=0
1919
compress/high_quality=false
2020
compress/lossy_quality=0.7
21+
compress/uastc_level=0
22+
compress/rdo_quality_loss=0.0
2123
compress/hdr_compression=1
2224
compress/normal_map=0
2325
compress/channel_pack=0
2426
mipmaps/generate=false
2527
mipmaps/limit=-1
2628
roughness/mode=0
2729
roughness/src_normal=""
30+
process/channel_remap/red=0
31+
process/channel_remap/green=1
32+
process/channel_remap/blue=2
33+
process/channel_remap/alpha=3
2834
process/fix_alpha_border=true
2935
process/premult_alpha=false
3036
process/normal_map_invert_y=false
Binary file not shown.

0 commit comments

Comments
 (0)