Skip to content

Commit 61999cb

Browse files
lukeeingramlukeeingram
committed
Formatting for my last commit.
1 parent 36d0432 commit 61999cb

6 files changed

Lines changed: 66 additions & 47 deletions

File tree

‎spine-godot/spine_godot/SpineAnimationTrack.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,7 @@ static AnimationPlayer *editing_animation_player() {
9393
for (int i = 0; i < connections.size(); i++) {
9494
Dictionary connection = connections[i];
9595
Signal signal = connection["signal"];
96-
if (signal.get_name() == SNAME("current_animation_changed"))
97-
return Object::cast_to<AnimationPlayer>(signal.get_object());
96+
if (signal.get_name() == SNAME("current_animation_changed")) return Object::cast_to<AnimationPlayer>(signal.get_object());
9897
}
9998
return nullptr;
10099
}
@@ -247,7 +246,8 @@ AnimationPlayer *SpineAnimationTrack::find_animation_player() {
247246

248247
void SpineAnimationTrack::setup_animation_player() {
249248
if (!sprite) return;
250-
if (controller.is_null() || !controller->get_skeleton_data_res().is_valid() || !controller->get_skeleton_data_res()->is_skeleton_data_loaded()) return;
249+
if (controller.is_null() || !controller->get_skeleton_data_res().is_valid() || !controller->get_skeleton_data_res()->is_skeleton_data_loaded())
250+
return;
251251
animation_player_dirty = false;
252252
AnimationPlayer *animation_player = find_animation_player();
253253

‎spine-godot/spine_godot/SpineController.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ void SpineController::_bind_methods() {
3737
ADD_SIGNAL(MethodInfo("_internal_spine_objects_invalidated"));
3838
}
3939

40-
SpineController::SpineController()
41-
: listener(nullptr), modified_bones(false), native_operation_depth(0), skeleton_data_reset_pending(false) {
40+
SpineController::SpineController() : listener(nullptr), modified_bones(false), native_operation_depth(0), skeleton_data_reset_pending(false) {
4241
}
4342

4443
SpineController::~SpineController() {

‎spine-godot/spine_godot/SpineEditorPlugin.h‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -434,18 +434,27 @@ class SpineBinaryResourceImportPlugin : public EditorImportPlugin {
434434
class SpineSprite3DGizmoPlugin : public EditorNode3DGizmoPlugin {
435435
GDCLASS(SpineSprite3DGizmoPlugin, EditorNode3DGizmoPlugin)
436436

437-
static void _bind_methods() {}
437+
static void _bind_methods() {
438+
}
438439

439440
public:
440441
#ifdef SPINE_GODOT_EXTENSION
441442
bool _has_gizmo(Node3D *node) const override;
442-
String _get_gizmo_name() const override { return "SpineSprite3D"; }
443-
bool _can_be_hidden() const override { return false; }
443+
String _get_gizmo_name() const override {
444+
return "SpineSprite3D";
445+
}
446+
bool _can_be_hidden() const override {
447+
return false;
448+
}
444449
void _redraw(const Ref<EditorNode3DGizmo> &gizmo) override;
445450
#else
446451
bool has_gizmo(Node3D *node) override;
447-
String get_gizmo_name() const override { return "SpineSprite3D"; }
448-
bool can_be_hidden() const override { return false; }
452+
String get_gizmo_name() const override {
453+
return "SpineSprite3D";
454+
}
455+
bool can_be_hidden() const override {
456+
return false;
457+
}
449458
void redraw(EditorNode3DGizmo *gizmo) override;
450459
#endif
451460
};

‎spine-godot/spine_godot/SpineSlotNode3D.cpp‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ void SpineSlotNode3D::_bind_methods() {
6464
ClassDB::bind_method(D_METHOD("get_additive_material"), &SpineSlotNode3D::get_additive_material);
6565
ClassDB::bind_method(D_METHOD("get_sorting_warnings"), &SpineSlotNode3D::get_sorting_warnings);
6666
ADD_PROPERTY(PropertyInfo(Variant::STRING, "slot_name"), "set_slot_name", "get_slot_name");
67-
ADD_PROPERTY(PropertyInfo(Variant::NODE_PATH, "depth_camera", PROPERTY_HINT_NODE_PATH_VALID_TYPES, "Camera3D"), "set_depth_camera", "get_depth_camera");
67+
ADD_PROPERTY(PropertyInfo(Variant::NODE_PATH, "depth_camera", PROPERTY_HINT_NODE_PATH_VALID_TYPES, "Camera3D"), "set_depth_camera",
68+
"get_depth_camera");
6869
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "normal_material", PROPERTY_HINT_RESOURCE_TYPE, "ShaderMaterial"), "set_normal_material",
6970
"get_normal_material");
7071
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "additive_material", PROPERTY_HINT_RESOURCE_TYPE, "ShaderMaterial"), "set_additive_material",
@@ -178,7 +179,9 @@ const std::vector<ObjectID> &SpineSlotNode3D::get_geometries() {
178179
if (geometries_dirty) {
179180
update_geometry_list();
180181
for (ObjectID id : geometries) {
181-
if (std::find_if(saved_sorting.begin(), saved_sorting.end(), [id](const SortingState &state) { return state.id == id; }) != saved_sorting.end()) continue;
182+
if (std::find_if(saved_sorting.begin(), saved_sorting.end(), [id](const SortingState &state) { return state.id == id; }) !=
183+
saved_sorting.end())
184+
continue;
182185
auto geometry = Object::cast_to<GeometryInstance3D>(ObjectDB::get_instance(id));
183186
if (geometry) saved_sorting.push_back({id, geometry->get_sorting_offset(), geometry->is_sorting_use_aabb_center()});
184187
}
@@ -220,7 +223,8 @@ float SpineSlotNode3D::get_depth_sign() const {
220223
// tree_changed can run between a Node3D's world exit and tree exit. Resolve
221224
// the world through its viewport, rather than calling get_world_3d then.
222225
if (!camera || !camera->is_inside_tree() || !camera->get_viewport() || !sprite->get_viewport() ||
223-
camera->get_viewport()->find_world_3d() != sprite->get_viewport()->find_world_3d()) return 1;
226+
camera->get_viewport()->find_world_3d() != sprite->get_viewport()->find_world_3d())
227+
return 1;
224228
return sprite->to_local(camera->get_global_transform().origin).z < 0 ? -1 : 1;
225229
}
226230

@@ -316,7 +320,8 @@ PackedStringArray SpineSlotNode3D::get_sorting_warnings() const {
316320
if (!camera || !camera->is_inside_tree() || !camera->get_viewport() || !sprite->get_viewport() ||
317321
camera->get_viewport()->find_world_3d() != sprite->get_viewport()->find_world_3d())
318322
warnings.push_back("depth_camera must reference a Camera3D in the same World3D; using fixed physical depth instead.");
319-
warnings.push_back("depth_camera moves this node and all descendants for ONE camera, including physics objects. It cannot follow opposite views simultaneously.");
323+
warnings.push_back("depth_camera moves this node and all descendants for ONE camera, including physics objects. It cannot follow opposite "
324+
"views simultaneously.");
320325
}
321326
std::vector<ObjectID> descendants;
322327
collect_geometry((Node *) this, descendants);

‎spine-godot/spine_godot/SpineSprite.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -332,9 +332,9 @@ void SpineMesh2D::update_mesh(const PackedVector2Array &vertices, const PackedVe
332332
#if VERSION_MINOR >= 3
333333
if (has_dark_color) {
334334
surface_offsets[RS::ARRAY_CUSTOM0] = RS::get_singleton()->mesh_surface_get_format_offset(surface_format, vertices.size(),
335-
RS::ARRAY_CUSTOM0);
335+
RS::ARRAY_CUSTOM0);
336336
surface_offsets[RS::ARRAY_CUSTOM1] = RS::get_singleton()->mesh_surface_get_format_offset(surface_format, vertices.size(),
337-
RS::ARRAY_CUSTOM1);
337+
RS::ARRAY_CUSTOM1);
338338
}
339339
#endif
340340
vertex_stride = RS::get_singleton()->mesh_surface_get_format_vertex_stride(surface_format, vertices.size());
@@ -540,9 +540,9 @@ void SpineSprite::_bind_methods() {
540540
ClassDB::bind_method(D_METHOD("on_skeleton_data_changed"), &SpineSprite::on_skeleton_data_changed);
541541

542542
ClassDB::bind_method(D_METHOD("get_global_bone_transform", "bone_name"),
543-
static_cast<Transform2D (SpineSprite::*)(const String &)>(&SpineSprite::get_global_bone_transform));
543+
static_cast<Transform2D (SpineSprite::*)(const String &)>(&SpineSprite::get_global_bone_transform));
544544
ClassDB::bind_method(D_METHOD("set_global_bone_transform", "bone_name", "global_transform"),
545-
static_cast<void (SpineSprite::*)(const String &, Transform2D)>(&SpineSprite::set_global_bone_transform));
545+
static_cast<void (SpineSprite::*)(const String &, Transform2D)>(&SpineSprite::set_global_bone_transform));
546546

547547
ClassDB::bind_method(D_METHOD("set_update_mode", "v"), &SpineSprite::set_update_mode);
548548
ClassDB::bind_method(D_METHOD("get_update_mode"), &SpineSprite::get_update_mode);

‎spine-godot/spine_godot/SpineSprite3D.cpp‎

Lines changed: 35 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -157,13 +157,17 @@ void SpineSprite3D::upload_batch(SpineBatch3D *item) {
157157
int cast_shadows = item->custom_material ? (int) shadow_casting : (int) SHADOW_CASTING_OFF;
158158
if (cast_shadows != item->last_shadow_casting) {
159159
#if !defined(SPINE_GODOT_EXTENSION) && VERSION_MINOR >= 7
160-
RSE::ShadowCastingSetting setting = cast_shadows == SHADOW_CASTING_ON ? RSE::SHADOW_CASTING_SETTING_ON :
161-
(cast_shadows == SHADOW_CASTING_DOUBLE_SIDED ? RSE::SHADOW_CASTING_SETTING_DOUBLE_SIDED :
162-
(cast_shadows == SHADOW_CASTING_SHADOWS_ONLY ? RSE::SHADOW_CASTING_SETTING_SHADOWS_ONLY : RSE::SHADOW_CASTING_SETTING_OFF));
160+
RSE::ShadowCastingSetting setting = cast_shadows == SHADOW_CASTING_ON
161+
? RSE::SHADOW_CASTING_SETTING_ON
162+
: (cast_shadows == SHADOW_CASTING_DOUBLE_SIDED
163+
? RSE::SHADOW_CASTING_SETTING_DOUBLE_SIDED
164+
: (cast_shadows == SHADOW_CASTING_SHADOWS_ONLY ? RSE::SHADOW_CASTING_SETTING_SHADOWS_ONLY : RSE::SHADOW_CASTING_SETTING_OFF));
163165
#else
164-
RS::ShadowCastingSetting setting = cast_shadows == SHADOW_CASTING_ON ? RS::SHADOW_CASTING_SETTING_ON :
165-
(cast_shadows == SHADOW_CASTING_DOUBLE_SIDED ? RS::SHADOW_CASTING_SETTING_DOUBLE_SIDED :
166-
(cast_shadows == SHADOW_CASTING_SHADOWS_ONLY ? RS::SHADOW_CASTING_SETTING_SHADOWS_ONLY : RS::SHADOW_CASTING_SETTING_OFF));
166+
RS::ShadowCastingSetting setting = cast_shadows == SHADOW_CASTING_ON
167+
? RS::SHADOW_CASTING_SETTING_ON
168+
: (cast_shadows == SHADOW_CASTING_DOUBLE_SIDED
169+
? RS::SHADOW_CASTING_SETTING_DOUBLE_SIDED
170+
: (cast_shadows == SHADOW_CASTING_SHADOWS_ONLY ? RS::SHADOW_CASTING_SETTING_SHADOWS_ONLY : RS::SHADOW_CASTING_SETTING_OFF));
167171
#endif
168172
RS::get_singleton()->instance_geometry_set_cast_shadows_setting(item->instance, setting);
169173
item->last_shadow_casting = cast_shadows;
@@ -258,7 +262,8 @@ void SpineSprite3D::upload_batch(SpineBatch3D *item) {
258262
RS::get_singleton()->mesh_add_surface(item->mesh, surface);
259263
uint32_t skin_stride;
260264
RS::get_singleton()->mesh_surface_make_offsets_from_format(surface.format, vertex_capacity, index_capacity, item->surface_offsets,
261-
item->vertex_stride, item->normal_tangent_stride, item->attribute_stride, skin_stride);
265+
item->vertex_stride, item->normal_tangent_stride, item->attribute_stride,
266+
skin_stride);
262267
item->index_stride = RS::get_singleton()->mesh_surface_get_format_index_stride(surface.format, vertex_capacity);
263268
item->vertex_buffer = surface.vertex_data;
264269
item->attribute_buffer = surface.attribute_data;
@@ -281,9 +286,8 @@ void SpineSprite3D::upload_batch(SpineBatch3D *item) {
281286
positions_changed |= position_changed;
282287
vertex_data_changed |= position_changed;
283288
if (item->uses_tangents) {
284-
bool tangent_changed = update_tangent_bytes(positions + item->surface_offsets[Mesh::ARRAY_TANGENT] +
285-
i * item->normal_tangent_stride,
286-
v.tangent);
289+
bool tangent_changed = update_tangent_bytes(positions + item->surface_offsets[Mesh::ARRAY_TANGENT] + i * item->normal_tangent_stride,
290+
v.tangent);
287291
tangents_changed |= tangent_changed;
288292
vertex_data_changed |= tangent_changed;
289293
}
@@ -491,13 +495,12 @@ void SpineSprite3D::_bind_methods() {
491495

492496
SpineSprite3D::SpineSprite3D()
493497
: update_mode(SpineConstant::UpdateMode_Process), time_scale(1.0f), pixel_size(0.01f), slot_depth_offset(0.001f), camera_relative_depth(true),
494-
depth_write_enabled(true), alpha_cutoff(0.001f), sorting_step(1.0f),
495-
render_priority(0), cull_mode(CULL_DISABLED), lighting_enabled(false), normal_map_enabled(true), normal_map_flip_y(true), normal_scale(1.0f),
496-
specular(0.25f), roughness(0.65f), metallic(0.0f), shadow_casting(SHADOW_CASTING_OFF), shadow_alpha_cutoff(0.3f),
497-
preview_skin("Default"), preview_animation("-- Empty --"), preview_frame(false), preview_time(0),
498-
skeleton_clipper(new spine::SkeletonClipping()), slots_dirty(true), updating_meshes(false), warned_multiply(false), warned_screen(false),
499-
active_batches(0), active_vertices(0), active_indices(0), mesh_builds(0), index_uploads(0), vertex_uploads(0), tangent_uploads(0), attribute_uploads(0),
500-
material_builds(0) {
498+
depth_write_enabled(true), alpha_cutoff(0.001f), sorting_step(1.0f), render_priority(0), cull_mode(CULL_DISABLED), lighting_enabled(false),
499+
normal_map_enabled(true), normal_map_flip_y(true), normal_scale(1.0f), specular(0.25f), roughness(0.65f), metallic(0.0f),
500+
shadow_casting(SHADOW_CASTING_OFF), shadow_alpha_cutoff(0.3f), preview_skin("Default"), preview_animation("-- Empty --"), preview_frame(false),
501+
preview_time(0), skeleton_clipper(new spine::SkeletonClipping()), slots_dirty(true), updating_meshes(false), warned_multiply(false),
502+
warned_screen(false), active_batches(0), active_vertices(0), active_indices(0), mesh_builds(0), index_uploads(0), vertex_uploads(0),
503+
tangent_uploads(0), attribute_uploads(0), material_builds(0) {
501504
controller = Ref<SpineController>(memnew(SpineController));
502505
controller->set_listener(this);
503506
quad_indices.setSize(6, 0);
@@ -721,7 +724,7 @@ uniform float spine_metallic = 0.0;
721724
}
722725
Ref<Shader> shader(memnew(Shader));
723726
shader->set_code(String("shader_type spatial;\nrender_mode ") + lighting_mode + depth + ", " + blend + ", " + cull + ";\n" +
724-
get_depth_shader_code() + R"(
727+
get_depth_shader_code() + R"(
725728
// Read encoded atlas colors: PMA must be undone before sRGB decoding.
726729
uniform sampler2D spine_texture : repeat_disable;
727730
uniform bool spine_premultiplied_alpha = false;
@@ -730,7 +733,8 @@ varying vec3 spine_dark_color;
730733
vec3 spine_srgb_to_linear(vec3 color) {
731734
return mix(pow((color + vec3(0.055)) / 1.055, vec3(2.4)), color / 12.92, lessThanEqual(color, vec3(0.04045)));
732735
}
733-
)" + lighting_declarations + R"(
736+
)" + lighting_declarations +
737+
R"(
734738
void vertex() {
735739
VERTEX = spine_apply_camera_depth(VERTEX, MODEL_MATRIX[3].xyz, MODEL_NORMAL_MATRIX[2], INV_VIEW_MATRIX[3].xyz);
736740
spine_light_color = CUSTOM0;
@@ -739,7 +743,8 @@ void vertex() {
739743
spine_light_color.rgb = spine_srgb_to_linear(spine_light_color.rgb);
740744
spine_dark_color = spine_srgb_to_linear(spine_dark_color);
741745
}
742-
)" + lighting_vertex + R"(
746+
)" + lighting_vertex +
747+
R"(
743748
}
744749
void fragment() {
745750
vec4 tex = texture(spine_texture, UV);
@@ -748,7 +753,8 @@ void fragment() {
748753
ALBEDO = tex.rgb * spine_light_color.rgb + (vec3(1.0) - tex.rgb) * spine_dark_color;
749754
ALPHA = tex.a * spine_light_color.a;
750755
spine_apply_alpha_cutoff(ALPHA);
751-
)" + lighting_fragment + R"(
756+
)" + lighting_fragment +
757+
R"(
752758
}
753759
)");
754760
shared = shader;
@@ -803,9 +809,9 @@ Ref<ShaderMaterial> SpineSprite3D::get_material(SpineRendererObject *renderer_ob
803809
int cull = source.is_valid() ? -1 : (int) cull_mode;
804810
bool depth_write = source.is_null() && depth_write_enabled;
805811
for (const auto &cached : materials) {
806-
if (cached.texture == texture_rid && cached.normal_texture == normal_texture_rid && cached.source == source_id && cached.blend == blend_mode &&
807-
cached.pma == premultiplied_alpha && cached.lighting == generated_lighting && cached.priority == render_priority && cached.cull == cull &&
808-
cached.depth_write == depth_write)
812+
if (cached.texture == texture_rid && cached.normal_texture == normal_texture_rid && cached.source == source_id &&
813+
cached.blend == blend_mode && cached.pma == premultiplied_alpha && cached.lighting == generated_lighting &&
814+
cached.priority == render_priority && cached.cull == cull && cached.depth_write == depth_write)
809815
return cached.material;
810816
}
811817
Ref<ShaderMaterial> material;
@@ -853,8 +859,8 @@ Ref<ShaderMaterial> SpineSprite3D::get_material(SpineRendererObject *renderer_ob
853859
material->set_shader_parameter(SNAME("spine_premultiplied_alpha"), premultiplied_alpha);
854860

855861
apply_runtime_parameters(material);
856-
materials.push_back({texture_rid, normal_texture_rid, source_id, material, blend_mode, premultiplied_alpha, generated_lighting, render_priority, cull,
857-
depth_write});
862+
materials.push_back({texture_rid, normal_texture_rid, source_id, material, blend_mode, premultiplied_alpha, generated_lighting, render_priority,
863+
cull, depth_write});
858864
material_builds++;
859865
return material;
860866
}
@@ -1040,10 +1046,10 @@ void SpineSprite3D::update_render_items(Ref<SpineSkeleton> skeleton_ref) {
10401046
}
10411047
Ref<ShaderMaterial> material = get_material(renderer_object, premultiplied_alpha, blend, override_material);
10421048
bool custom_material = override_material.is_valid();
1043-
if (!custom_material)
1044-
custom_material = blend == spine::BlendMode_Additive ? additive_material.is_valid() : normal_material.is_valid();
1049+
if (!custom_material) custom_material = blend == spine::BlendMode_Additive ? additive_material.is_valid() : normal_material.is_valid();
10451050
Ref<ShaderMaterial> shadow_material = custom_material ? Ref<ShaderMaterial>() : get_shadow_material(renderer_object);
1046-
if (!current || current->material != material || current->shadow_material != shadow_material || current->custom_material != custom_material)
1051+
if (!current || current->material != material || current->shadow_material != shadow_material ||
1052+
current->custom_material != custom_material)
10471053
current = begin_batch(material, shadow_material, custom_material);
10481054
uint32_t base_vertex = (uint32_t) current->vertices.size();
10491055
int vertex_count = (int) vertices->size() / 2;

0 commit comments

Comments
 (0)