From 8f831bd245bf5c77e77792b7ba9dbec8974bbc7e Mon Sep 17 00:00:00 2001 From: Mario Zechner Date: Thu, 10 Jul 2025 04:44:35 +0200 Subject: [PATCH] [c] More fixes to C wrapper generator, everything compiles, smoke test works --- .../task.md | 3 + spine-c-new/CMakeLists.txt | 3 + spine-c-new/codegen/src/c-writer.ts | 5 + spine-c-new/include/spine-c.h | 2 +- spine-c-new/src/base.h | 2 +- spine-c-new/src/extensions.h | 10 +- spine-c-new/src/generated/alpha_timeline.h | 2 +- spine-c-new/src/generated/animation.h | 2 +- spine-c-new/src/generated/animation_state.h | 2 +- .../src/generated/animation_state_data.h | 2 +- spine-c-new/src/generated/arrays.h | 2 +- spine-c-new/src/generated/atlas.h | 2 +- .../src/generated/atlas_attachment_loader.h | 2 +- spine-c-new/src/generated/atlas_page.h | 2 +- spine-c-new/src/generated/atlas_region.h | 2 +- spine-c-new/src/generated/attachment.h | 2 +- spine-c-new/src/generated/attachment_loader.h | 2 +- .../src/generated/attachment_timeline.h | 2 +- spine-c-new/src/generated/attachment_type.h | 2 +- spine-c-new/src/generated/blend_mode.h | 2 +- spine-c-new/src/generated/bone.h | 2 +- spine-c-new/src/generated/bone_data.h | 2 +- spine-c-new/src/generated/bone_local.h | 2 +- spine-c-new/src/generated/bone_pose.h | 2 +- spine-c-new/src/generated/bone_timeline.h | 2 +- spine-c-new/src/generated/bone_timeline1.h | 2 +- spine-c-new/src/generated/bone_timeline2.h | 2 +- .../src/generated/bounding_box_attachment.h | 2 +- .../src/generated/clipping_attachment.h | 2 +- spine-c-new/src/generated/color.h | 2 +- spine-c-new/src/generated/constraint.h | 2 +- spine-c-new/src/generated/constraint_data.h | 2 +- .../src/generated/constraint_timeline.h | 2 +- .../src/generated/constraint_timeline1.h | 2 +- spine-c-new/src/generated/curve_timeline.h | 2 +- spine-c-new/src/generated/curve_timeline1.h | 2 +- spine-c-new/src/generated/curve_timeline2.h | 2 +- spine-c-new/src/generated/deform_timeline.h | 2 +- .../src/generated/draw_order_timeline.h | 2 +- spine-c-new/src/generated/event.h | 2 +- spine-c-new/src/generated/event_data.h | 2 +- spine-c-new/src/generated/event_queue_entry.h | 2 +- spine-c-new/src/generated/event_timeline.h | 2 +- spine-c-new/src/generated/event_type.h | 2 +- spine-c-new/src/generated/format.h | 2 +- spine-c-new/src/generated/from_property.h | 2 +- spine-c-new/src/generated/from_rotate.h | 2 +- spine-c-new/src/generated/from_scale_x.h | 2 +- spine-c-new/src/generated/from_scale_y.h | 2 +- spine-c-new/src/generated/from_shear_y.h | 2 +- spine-c-new/src/generated/from_x.h | 2 +- spine-c-new/src/generated/from_y.h | 2 +- spine-c-new/src/generated/ik_constraint.h | 2 +- .../src/generated/ik_constraint_data.h | 2 +- .../src/generated/ik_constraint_pose.h | 2 +- .../src/generated/ik_constraint_timeline.h | 2 +- spine-c-new/src/generated/inherit.h | 2 +- spine-c-new/src/generated/inherit_timeline.h | 2 +- spine-c-new/src/generated/linked_mesh.h | 2 +- spine-c-new/src/generated/mesh_attachment.h | 2 +- spine-c-new/src/generated/mix_blend.h | 2 +- spine-c-new/src/generated/mix_direction.h | 2 +- spine-c-new/src/generated/path_attachment.h | 2 +- spine-c-new/src/generated/path_constraint.h | 2 +- .../src/generated/path_constraint_data.h | 2 +- .../generated/path_constraint_mix_timeline.h | 2 +- .../src/generated/path_constraint_pose.h | 2 +- .../path_constraint_position_timeline.h | 2 +- .../path_constraint_spacing_timeline.h | 2 +- spine-c-new/src/generated/physics.h | 2 +- .../src/generated/physics_constraint.h | 2 +- .../physics_constraint_damping_timeline.h | 2 +- .../src/generated/physics_constraint_data.h | 2 +- .../physics_constraint_gravity_timeline.h | 2 +- .../physics_constraint_inertia_timeline.h | 2 +- .../physics_constraint_mass_timeline.h | 2 +- .../physics_constraint_mix_timeline.h | 2 +- .../src/generated/physics_constraint_pose.h | 2 +- .../physics_constraint_reset_timeline.h | 2 +- .../physics_constraint_strength_timeline.h | 2 +- .../generated/physics_constraint_timeline.h | 2 +- .../physics_constraint_wind_timeline.h | 2 +- spine-c-new/src/generated/point_attachment.h | 2 +- spine-c-new/src/generated/polygon.h | 2 +- spine-c-new/src/generated/posed.h | 2 +- spine-c-new/src/generated/posed_active.h | 2 +- spine-c-new/src/generated/posed_data.h | 2 +- spine-c-new/src/generated/position_mode.h | 2 +- spine-c-new/src/generated/property.h | 2 +- spine-c-new/src/generated/region_attachment.h | 2 +- spine-c-new/src/generated/render_command.h | 2 +- spine-c-new/src/generated/rgb2_timeline.h | 2 +- spine-c-new/src/generated/rgb_timeline.h | 2 +- spine-c-new/src/generated/rgba2_timeline.h | 2 +- spine-c-new/src/generated/rgba_timeline.h | 2 +- spine-c-new/src/generated/rotate_mode.h | 2 +- spine-c-new/src/generated/rotate_timeline.h | 2 +- spine-c-new/src/generated/rtti.h | 2 +- spine-c-new/src/generated/scale_timeline.h | 2 +- spine-c-new/src/generated/scale_x_timeline.h | 2 +- spine-c-new/src/generated/scale_y_timeline.h | 2 +- spine-c-new/src/generated/sequence.h | 2 +- spine-c-new/src/generated/sequence_mode.h | 2 +- spine-c-new/src/generated/sequence_timeline.h | 2 +- spine-c-new/src/generated/shear_timeline.h | 2 +- spine-c-new/src/generated/shear_x_timeline.h | 2 +- spine-c-new/src/generated/shear_y_timeline.h | 2 +- spine-c-new/src/generated/skeleton.h | 2 +- spine-c-new/src/generated/skeleton_binary.h | 2 +- spine-c-new/src/generated/skeleton_bounds.h | 2 +- spine-c-new/src/generated/skeleton_clipping.h | 2 +- spine-c-new/src/generated/skeleton_data.h | 2 +- spine-c-new/src/generated/skeleton_json.h | 2 +- spine-c-new/src/generated/skeleton_renderer.h | 2 +- spine-c-new/src/generated/skin.h | 2 +- spine-c-new/src/generated/slider.h | 2 +- spine-c-new/src/generated/slider_data.h | 2 +- .../src/generated/slider_mix_timeline.h | 2 +- spine-c-new/src/generated/slider_pose.h | 2 +- spine-c-new/src/generated/slider_timeline.h | 2 +- spine-c-new/src/generated/slot.h | 2 +- .../src/generated/slot_curve_timeline.h | 2 +- spine-c-new/src/generated/slot_data.h | 2 +- spine-c-new/src/generated/slot_pose.h | 2 +- spine-c-new/src/generated/slot_timeline.h | 2 +- spine-c-new/src/generated/spacing_mode.h | 2 +- spine-c-new/src/generated/texture_filter.h | 2 +- spine-c-new/src/generated/texture_region.h | 2 +- spine-c-new/src/generated/texture_wrap.h | 2 +- spine-c-new/src/generated/timeline.h | 2 +- spine-c-new/src/generated/to_property.h | 2 +- spine-c-new/src/generated/to_rotate.h | 2 +- spine-c-new/src/generated/to_scale_x.h | 2 +- spine-c-new/src/generated/to_scale_y.h | 2 +- spine-c-new/src/generated/to_shear_y.h | 2 +- spine-c-new/src/generated/to_x.h | 2 +- spine-c-new/src/generated/to_y.h | 2 +- spine-c-new/src/generated/track_entry.h | 2 +- .../src/generated/transform_constraint.h | 2 +- .../src/generated/transform_constraint_data.h | 2 +- .../src/generated/transform_constraint_pose.h | 2 +- .../generated/transform_constraint_timeline.h | 2 +- .../src/generated/translate_timeline.h | 2 +- .../src/generated/translate_x_timeline.h | 2 +- .../src/generated/translate_y_timeline.h | 2 +- spine-c-new/src/generated/types.h | 2 +- spine-c-new/src/generated/update.h | 2 +- spine-c-new/src/generated/vertex_attachment.h | 2 +- spine-c-new/test/test.c | 14 +- spine-cpp/spine-cpp/include/spine/Debug.h | 171 +++++++++++++++++- spine-cpp/spine-cpp/include/spine/HashMap.h | 2 +- 151 files changed, 331 insertions(+), 165 deletions(-) diff --git a/docs/todos/work/2025-07-08-22-31-47-review-spine-c-new-codegen/task.md b/docs/todos/work/2025-07-08-22-31-47-review-spine-c-new-codegen/task.md index 2b69fd12d..5087a3edf 100644 --- a/docs/todos/work/2025-07-08-22-31-47-review-spine-c-new-codegen/task.md +++ b/docs/todos/work/2025-07-08-22-31-47-review-spine-c-new-codegen/task.md @@ -238,3 +238,6 @@ class CWriter { ## checks.ts (continued) - [x] Fix checkConstNonConstConflicts - it was checking for different return types instead of checking for const vs non-const methods + +## Build fixes +- [x] Fixed RTTI linking errors by including flags.cmake in spine-c-new CMakeLists.txt to enable -fno-rtti flag diff --git a/spine-c-new/CMakeLists.txt b/spine-c-new/CMakeLists.txt index d5fde14d1..1cd18ffca 100644 --- a/spine-c-new/CMakeLists.txt +++ b/spine-c-new/CMakeLists.txt @@ -4,6 +4,9 @@ project(spine-c-new C CXX) set(CMAKE_C_STANDARD 99) set(CMAKE_CXX_STANDARD 11) +# Include the common flags (including -fno-rtti) +include(${CMAKE_CURRENT_LIST_DIR}/../flags.cmake) + # Include spine-cpp add_subdirectory(../spine-cpp ${CMAKE_CURRENT_BINARY_DIR}/spine-cpp) diff --git a/spine-c-new/codegen/src/c-writer.ts b/spine-c-new/codegen/src/c-writer.ts index 82055c9a8..65b003578 100644 --- a/spine-c-new/codegen/src/c-writer.ts +++ b/spine-c-new/codegen/src/c-writer.ts @@ -66,6 +66,7 @@ export class CWriter { lines.push('#endif'); lines.push(''); lines.push(`#endif /* ${guardName} */`); + lines.push(''); return lines.join('\n'); } @@ -135,6 +136,7 @@ export class CWriter { lines.push('#endif'); lines.push(''); lines.push(`#endif /* ${guardName} */`); + lines.push(''); return lines.join('\n'); } @@ -211,6 +213,7 @@ export class CWriter { lines.push(''); lines.push('#endif // SPINE_C_H'); + lines.push(''); fs.writeFileSync(mainHeaderPath, lines.join('\n')); } @@ -255,6 +258,7 @@ export class CWriter { arrayHeaderLines.push('#endif'); arrayHeaderLines.push(''); arrayHeaderLines.push('#endif /* SPINE_C_ARRAYS_H */'); + arrayHeaderLines.push(''); } // Generate source @@ -325,6 +329,7 @@ export class CWriter { lines.push('#endif'); lines.push(''); lines.push('#endif // SPINE_C_TYPES_H'); + lines.push(''); fs.writeFileSync(headerPath, lines.join('\n')); } diff --git a/spine-c-new/include/spine-c.h b/spine-c-new/include/spine-c.h index 96878f3a3..cbc4a99d1 100644 --- a/spine-c-new/include/spine-c.h +++ b/spine-c-new/include/spine-c.h @@ -166,4 +166,4 @@ #include "../src/generated/update.h" #include "../src/generated/vertex_attachment.h" -#endif // SPINE_C_H \ No newline at end of file +#endif // SPINE_C_H diff --git a/spine-c-new/src/base.h b/spine-c-new/src/base.h index dc102b63c..3c68e1029 100644 --- a/spine-c-new/src/base.h +++ b/spine-c-new/src/base.h @@ -64,4 +64,4 @@ typedef long long spine_property_id; -#endif // SPINE_C_BASE_H \ No newline at end of file +#endif // SPINE_C_BASE_H diff --git a/spine-c-new/src/extensions.h b/spine-c-new/src/extensions.h index cf278e407..33dbb53cc 100644 --- a/spine-c-new/src/extensions.h +++ b/spine-c-new/src/extensions.h @@ -55,10 +55,10 @@ typedef void* (*spine_texture_loader_load_func)(const char *path); typedef void (*spine_texture_loader_unload_func)(void *texture); // Version functions -SPINE_C_API int32_t spine_major_version(); -SPINE_C_API int32_t spine_minor_version(); +SPINE_C_API int32_t spine_major_version(void); +SPINE_C_API int32_t spine_minor_version(void); SPINE_C_API void spine_enable_debug_extension(bool enable); -SPINE_C_API void spine_report_leaks(); +SPINE_C_API void spine_report_leaks(void); // Bounds functions SPINE_C_API float spine_bounds_get_x(spine_bounds bounds); @@ -98,7 +98,7 @@ SPINE_C_API spine_animation_state_data spine_skeleton_drawable_get_animation_sta SPINE_C_API spine_animation_state_events spine_skeleton_drawable_get_animation_state_events(spine_skeleton_drawable drawable); // Skin entries functions -SPINE_C_API spine_skin_entries spine_skin_entries_create(); +SPINE_C_API spine_skin_entries spine_skin_entries_create(void); SPINE_C_API void spine_skin_entries_dispose(spine_skin_entries entries); SPINE_C_API int32_t spine_skin_entries_get_num_entries(spine_skin_entries entries); SPINE_C_API spine_skin_entry spine_skin_entries_get_entry(spine_skin_entries entries, int32_t index); @@ -112,4 +112,4 @@ SPINE_C_API spine_attachment spine_skin_entry_get_attachment(spine_skin_entry en } #endif -#endif // SPINE_C_EXTENSIONS_H \ No newline at end of file +#endif // SPINE_C_EXTENSIONS_H diff --git a/spine-c-new/src/generated/alpha_timeline.h b/spine-c-new/src/generated/alpha_timeline.h index f2c5b9c25..60e05ce25 100644 --- a/spine-c-new/src/generated/alpha_timeline.h +++ b/spine-c-new/src/generated/alpha_timeline.h @@ -38,4 +38,4 @@ SPINE_C_API spine_rtti spine_alpha_timeline_rtti(void); } #endif -#endif /* SPINE_SPINE_ALPHA_TIMELINE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_ALPHA_TIMELINE_H */ diff --git a/spine-c-new/src/generated/animation.h b/spine-c-new/src/generated/animation.h index 7cb90ca32..db01cf2cd 100644 --- a/spine-c-new/src/generated/animation.h +++ b/spine-c-new/src/generated/animation.h @@ -27,4 +27,4 @@ SPINE_C_API int spine_animation_search_2(spine_array_float values, float target, } #endif -#endif /* SPINE_SPINE_ANIMATION_H */ \ No newline at end of file +#endif /* SPINE_SPINE_ANIMATION_H */ diff --git a/spine-c-new/src/generated/animation_state.h b/spine-c-new/src/generated/animation_state.h index 68f3b9caf..70443705c 100644 --- a/spine-c-new/src/generated/animation_state.h +++ b/spine-c-new/src/generated/animation_state.h @@ -39,4 +39,4 @@ SPINE_C_API void * spine_animation_state_get_renderer_object(spine_animation_sta } #endif -#endif /* SPINE_SPINE_ANIMATION_STATE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_ANIMATION_STATE_H */ diff --git a/spine-c-new/src/generated/animation_state_data.h b/spine-c-new/src/generated/animation_state_data.h index a85d2facc..1e55ceb58 100644 --- a/spine-c-new/src/generated/animation_state_data.h +++ b/spine-c-new/src/generated/animation_state_data.h @@ -24,4 +24,4 @@ SPINE_C_API void spine_animation_state_data_clear(spine_animation_state_data sel } #endif -#endif /* SPINE_SPINE_ANIMATION_STATE_DATA_H */ \ No newline at end of file +#endif /* SPINE_SPINE_ANIMATION_STATE_DATA_H */ diff --git a/spine-c-new/src/generated/arrays.h b/spine-c-new/src/generated/arrays.h index f48fbfd73..46ac76019 100644 --- a/spine-c-new/src/generated/arrays.h +++ b/spine-c-new/src/generated/arrays.h @@ -941,4 +941,4 @@ SPINE_C_API spine_update * spine_array_update_buffer(spine_array_update array); } #endif -#endif /* SPINE_C_ARRAYS_H */ \ No newline at end of file +#endif /* SPINE_C_ARRAYS_H */ diff --git a/spine-c-new/src/generated/atlas.h b/spine-c-new/src/generated/atlas.h index 9da000e5f..646220152 100644 --- a/spine-c-new/src/generated/atlas.h +++ b/spine-c-new/src/generated/atlas.h @@ -19,4 +19,4 @@ SPINE_C_API spine_array_atlas_region spine_atlas_get_regions(spine_atlas self); } #endif -#endif /* SPINE_SPINE_ATLAS_H */ \ No newline at end of file +#endif /* SPINE_SPINE_ATLAS_H */ diff --git a/spine-c-new/src/generated/atlas_attachment_loader.h b/spine-c-new/src/generated/atlas_attachment_loader.h index df5ae2108..61a88a15c 100644 --- a/spine-c-new/src/generated/atlas_attachment_loader.h +++ b/spine-c-new/src/generated/atlas_attachment_loader.h @@ -24,4 +24,4 @@ SPINE_C_API spine_atlas_region spine_atlas_attachment_loader_find_region(spine_a } #endif -#endif /* SPINE_SPINE_ATLAS_ATTACHMENT_LOADER_H */ \ No newline at end of file +#endif /* SPINE_SPINE_ATLAS_ATTACHMENT_LOADER_H */ diff --git a/spine-c-new/src/generated/atlas_page.h b/spine-c-new/src/generated/atlas_page.h index e960c3f88..74aa90019 100644 --- a/spine-c-new/src/generated/atlas_page.h +++ b/spine-c-new/src/generated/atlas_page.h @@ -41,4 +41,4 @@ SPINE_C_API void spine_atlas_page_set_texture(spine_atlas_page self, void * valu } #endif -#endif /* SPINE_SPINE_ATLAS_PAGE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_ATLAS_PAGE_H */ diff --git a/spine-c-new/src/generated/atlas_region.h b/spine-c-new/src/generated/atlas_region.h index b5491d607..1b307e7e8 100644 --- a/spine-c-new/src/generated/atlas_region.h +++ b/spine-c-new/src/generated/atlas_region.h @@ -33,4 +33,4 @@ SPINE_C_API void spine_atlas_region_set_values(spine_atlas_region self, spine_ar } #endif -#endif /* SPINE_SPINE_ATLAS_REGION_H */ \ No newline at end of file +#endif /* SPINE_SPINE_ATLAS_REGION_H */ diff --git a/spine-c-new/src/generated/attachment.h b/spine-c-new/src/generated/attachment.h index 7bc464ae7..1b45e3139 100644 --- a/spine-c-new/src/generated/attachment.h +++ b/spine-c-new/src/generated/attachment.h @@ -22,4 +22,4 @@ SPINE_C_API spine_rtti spine_attachment_rtti(void); } #endif -#endif /* SPINE_SPINE_ATTACHMENT_H */ \ No newline at end of file +#endif /* SPINE_SPINE_ATTACHMENT_H */ diff --git a/spine-c-new/src/generated/attachment_loader.h b/spine-c-new/src/generated/attachment_loader.h index 24eecaf4c..f656d8839 100644 --- a/spine-c-new/src/generated/attachment_loader.h +++ b/spine-c-new/src/generated/attachment_loader.h @@ -21,4 +21,4 @@ SPINE_C_API spine_clipping_attachment spine_attachment_loader_new_clipping_attac } #endif -#endif /* SPINE_SPINE_ATTACHMENT_LOADER_H */ \ No newline at end of file +#endif /* SPINE_SPINE_ATTACHMENT_LOADER_H */ diff --git a/spine-c-new/src/generated/attachment_timeline.h b/spine-c-new/src/generated/attachment_timeline.h index c3002aba5..fb9127913 100644 --- a/spine-c-new/src/generated/attachment_timeline.h +++ b/spine-c-new/src/generated/attachment_timeline.h @@ -28,4 +28,4 @@ SPINE_C_API spine_rtti spine_attachment_timeline_rtti(void); } #endif -#endif /* SPINE_SPINE_ATTACHMENT_TIMELINE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_ATTACHMENT_TIMELINE_H */ diff --git a/spine-c-new/src/generated/attachment_type.h b/spine-c-new/src/generated/attachment_type.h index 3709bb12a..9f03b0f5c 100644 --- a/spine-c-new/src/generated/attachment_type.h +++ b/spine-c-new/src/generated/attachment_type.h @@ -19,4 +19,4 @@ typedef enum spine_attachment_type { } #endif -#endif /* SPINE_SPINE_ATTACHMENT_TYPE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_ATTACHMENT_TYPE_H */ diff --git a/spine-c-new/src/generated/blend_mode.h b/spine-c-new/src/generated/blend_mode.h index 68723b93e..302183888 100644 --- a/spine-c-new/src/generated/blend_mode.h +++ b/spine-c-new/src/generated/blend_mode.h @@ -16,4 +16,4 @@ typedef enum spine_blend_mode { } #endif -#endif /* SPINE_SPINE_BLEND_MODE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_BLEND_MODE_H */ diff --git a/spine-c-new/src/generated/bone.h b/spine-c-new/src/generated/bone.h index 668ac3796..818f0eb9a 100644 --- a/spine-c-new/src/generated/bone.h +++ b/spine-c-new/src/generated/bone.h @@ -32,4 +32,4 @@ SPINE_C_API spine_rtti spine_bone_rtti(void); } #endif -#endif /* SPINE_SPINE_BONE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_BONE_H */ diff --git a/spine-c-new/src/generated/bone_data.h b/spine-c-new/src/generated/bone_data.h index 48ad2f95a..7ca342a90 100644 --- a/spine-c-new/src/generated/bone_data.h +++ b/spine-c-new/src/generated/bone_data.h @@ -30,4 +30,4 @@ SPINE_C_API void spine_bone_data_set_skin_required(spine_bone_data self, bool sk } #endif -#endif /* SPINE_SPINE_BONE_DATA_H */ \ No newline at end of file +#endif /* SPINE_SPINE_BONE_DATA_H */ diff --git a/spine-c-new/src/generated/bone_local.h b/spine-c-new/src/generated/bone_local.h index 4db1ecb89..1fee5715d 100644 --- a/spine-c-new/src/generated/bone_local.h +++ b/spine-c-new/src/generated/bone_local.h @@ -37,4 +37,4 @@ SPINE_C_API void spine_bone_local_set_inherit(spine_bone_local self, spine_inher } #endif -#endif /* SPINE_SPINE_BONE_LOCAL_H */ \ No newline at end of file +#endif /* SPINE_SPINE_BONE_LOCAL_H */ diff --git a/spine-c-new/src/generated/bone_pose.h b/spine-c-new/src/generated/bone_pose.h index a3771db0b..871d88728 100644 --- a/spine-c-new/src/generated/bone_pose.h +++ b/spine-c-new/src/generated/bone_pose.h @@ -69,4 +69,4 @@ SPINE_C_API spine_rtti spine_bone_pose_rtti(void); } #endif -#endif /* SPINE_SPINE_BONE_POSE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_BONE_POSE_H */ diff --git a/spine-c-new/src/generated/bone_timeline.h b/spine-c-new/src/generated/bone_timeline.h index 07b7f5c4f..df262825d 100644 --- a/spine-c-new/src/generated/bone_timeline.h +++ b/spine-c-new/src/generated/bone_timeline.h @@ -19,4 +19,4 @@ SPINE_C_API spine_rtti spine_bone_timeline_rtti(void); } #endif -#endif /* SPINE_SPINE_BONE_TIMELINE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_BONE_TIMELINE_H */ diff --git a/spine-c-new/src/generated/bone_timeline1.h b/spine-c-new/src/generated/bone_timeline1.h index 1e05db091..c79ea4463 100644 --- a/spine-c-new/src/generated/bone_timeline1.h +++ b/spine-c-new/src/generated/bone_timeline1.h @@ -36,4 +36,4 @@ SPINE_C_API spine_rtti spine_bone_timeline1_rtti(void); } #endif -#endif /* SPINE_SPINE_BONE_TIMELINE1_H */ \ No newline at end of file +#endif /* SPINE_SPINE_BONE_TIMELINE1_H */ diff --git a/spine-c-new/src/generated/bone_timeline2.h b/spine-c-new/src/generated/bone_timeline2.h index d1f98f768..56eb1ae8d 100644 --- a/spine-c-new/src/generated/bone_timeline2.h +++ b/spine-c-new/src/generated/bone_timeline2.h @@ -32,4 +32,4 @@ SPINE_C_API spine_rtti spine_bone_timeline2_rtti(void); } #endif -#endif /* SPINE_SPINE_BONE_TIMELINE2_H */ \ No newline at end of file +#endif /* SPINE_SPINE_BONE_TIMELINE2_H */ diff --git a/spine-c-new/src/generated/bounding_box_attachment.h b/spine-c-new/src/generated/bounding_box_attachment.h index d5331f466..3d10b7a45 100644 --- a/spine-c-new/src/generated/bounding_box_attachment.h +++ b/spine-c-new/src/generated/bounding_box_attachment.h @@ -37,4 +37,4 @@ SPINE_C_API spine_rtti spine_bounding_box_attachment_rtti(void); } #endif -#endif /* SPINE_SPINE_BOUNDING_BOX_ATTACHMENT_H */ \ No newline at end of file +#endif /* SPINE_SPINE_BOUNDING_BOX_ATTACHMENT_H */ diff --git a/spine-c-new/src/generated/clipping_attachment.h b/spine-c-new/src/generated/clipping_attachment.h index b5ec79643..a6e903fd7 100644 --- a/spine-c-new/src/generated/clipping_attachment.h +++ b/spine-c-new/src/generated/clipping_attachment.h @@ -39,4 +39,4 @@ SPINE_C_API spine_rtti spine_clipping_attachment_rtti(void); } #endif -#endif /* SPINE_SPINE_CLIPPING_ATTACHMENT_H */ \ No newline at end of file +#endif /* SPINE_SPINE_CLIPPING_ATTACHMENT_H */ diff --git a/spine-c-new/src/generated/color.h b/spine-c-new/src/generated/color.h index e7960e98c..40d4b2773 100644 --- a/spine-c-new/src/generated/color.h +++ b/spine-c-new/src/generated/color.h @@ -36,4 +36,4 @@ SPINE_C_API void spine_color_set_a(spine_color self, float value); } #endif -#endif /* SPINE_SPINE_COLOR_H */ \ No newline at end of file +#endif /* SPINE_SPINE_COLOR_H */ diff --git a/spine-c-new/src/generated/constraint.h b/spine-c-new/src/generated/constraint.h index 0e9ab880a..e6cb78272 100644 --- a/spine-c-new/src/generated/constraint.h +++ b/spine-c-new/src/generated/constraint.h @@ -21,4 +21,4 @@ SPINE_C_API spine_rtti spine_constraint_rtti(void); } #endif -#endif /* SPINE_SPINE_CONSTRAINT_H */ \ No newline at end of file +#endif /* SPINE_SPINE_CONSTRAINT_H */ diff --git a/spine-c-new/src/generated/constraint_data.h b/spine-c-new/src/generated/constraint_data.h index e4ae11486..bd14a7c47 100644 --- a/spine-c-new/src/generated/constraint_data.h +++ b/spine-c-new/src/generated/constraint_data.h @@ -20,4 +20,4 @@ SPINE_C_API spine_rtti spine_constraint_data_rtti(void); } #endif -#endif /* SPINE_SPINE_CONSTRAINT_DATA_H */ \ No newline at end of file +#endif /* SPINE_SPINE_CONSTRAINT_DATA_H */ diff --git a/spine-c-new/src/generated/constraint_timeline.h b/spine-c-new/src/generated/constraint_timeline.h index 07e5a01d7..765ea45f6 100644 --- a/spine-c-new/src/generated/constraint_timeline.h +++ b/spine-c-new/src/generated/constraint_timeline.h @@ -19,4 +19,4 @@ SPINE_C_API spine_rtti spine_constraint_timeline_rtti(void); } #endif -#endif /* SPINE_SPINE_CONSTRAINT_TIMELINE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_CONSTRAINT_TIMELINE_H */ diff --git a/spine-c-new/src/generated/constraint_timeline1.h b/spine-c-new/src/generated/constraint_timeline1.h index dc764a1d7..266be1821 100644 --- a/spine-c-new/src/generated/constraint_timeline1.h +++ b/spine-c-new/src/generated/constraint_timeline1.h @@ -36,4 +36,4 @@ SPINE_C_API spine_rtti spine_constraint_timeline1_rtti(void); } #endif -#endif /* SPINE_SPINE_CONSTRAINT_TIMELINE1_H */ \ No newline at end of file +#endif /* SPINE_SPINE_CONSTRAINT_TIMELINE1_H */ diff --git a/spine-c-new/src/generated/curve_timeline.h b/spine-c-new/src/generated/curve_timeline.h index d574ec439..9b758991a 100644 --- a/spine-c-new/src/generated/curve_timeline.h +++ b/spine-c-new/src/generated/curve_timeline.h @@ -28,4 +28,4 @@ SPINE_C_API spine_rtti spine_curve_timeline_rtti(void); } #endif -#endif /* SPINE_SPINE_CURVE_TIMELINE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_CURVE_TIMELINE_H */ diff --git a/spine-c-new/src/generated/curve_timeline1.h b/spine-c-new/src/generated/curve_timeline1.h index fae33c302..5fd606842 100644 --- a/spine-c-new/src/generated/curve_timeline1.h +++ b/spine-c-new/src/generated/curve_timeline1.h @@ -34,4 +34,4 @@ SPINE_C_API spine_rtti spine_curve_timeline1_rtti(void); } #endif -#endif /* SPINE_SPINE_CURVE_TIMELINE1_H */ \ No newline at end of file +#endif /* SPINE_SPINE_CURVE_TIMELINE1_H */ diff --git a/spine-c-new/src/generated/curve_timeline2.h b/spine-c-new/src/generated/curve_timeline2.h index 67b505bb8..9d52d24c1 100644 --- a/spine-c-new/src/generated/curve_timeline2.h +++ b/spine-c-new/src/generated/curve_timeline2.h @@ -30,4 +30,4 @@ SPINE_C_API spine_rtti spine_curve_timeline2_rtti(void); } #endif -#endif /* SPINE_SPINE_CURVE_TIMELINE2_H */ \ No newline at end of file +#endif /* SPINE_SPINE_CURVE_TIMELINE2_H */ diff --git a/spine-c-new/src/generated/deform_timeline.h b/spine-c-new/src/generated/deform_timeline.h index 98fdec7c4..7fa439fa0 100644 --- a/spine-c-new/src/generated/deform_timeline.h +++ b/spine-c-new/src/generated/deform_timeline.h @@ -36,4 +36,4 @@ SPINE_C_API spine_rtti spine_deform_timeline_rtti(void); } #endif -#endif /* SPINE_SPINE_DEFORM_TIMELINE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_DEFORM_TIMELINE_H */ diff --git a/spine-c-new/src/generated/draw_order_timeline.h b/spine-c-new/src/generated/draw_order_timeline.h index 5464b8ff4..3642d8a9b 100644 --- a/spine-c-new/src/generated/draw_order_timeline.h +++ b/spine-c-new/src/generated/draw_order_timeline.h @@ -26,4 +26,4 @@ SPINE_C_API spine_rtti spine_draw_order_timeline_rtti(void); } #endif -#endif /* SPINE_SPINE_DRAW_ORDER_TIMELINE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_DRAW_ORDER_TIMELINE_H */ diff --git a/spine-c-new/src/generated/event.h b/spine-c-new/src/generated/event.h index a28e30cf6..2658865cf 100644 --- a/spine-c-new/src/generated/event.h +++ b/spine-c-new/src/generated/event.h @@ -29,4 +29,4 @@ SPINE_C_API void spine_event_set_balance(spine_event self, float inValue); } #endif -#endif /* SPINE_SPINE_EVENT_H */ \ No newline at end of file +#endif /* SPINE_SPINE_EVENT_H */ diff --git a/spine-c-new/src/generated/event_data.h b/spine-c-new/src/generated/event_data.h index 2ab1bfaf4..6e5cbbf33 100644 --- a/spine-c-new/src/generated/event_data.h +++ b/spine-c-new/src/generated/event_data.h @@ -30,4 +30,4 @@ SPINE_C_API void spine_event_data_set_balance(spine_event_data self, float inVal } #endif -#endif /* SPINE_SPINE_EVENT_DATA_H */ \ No newline at end of file +#endif /* SPINE_SPINE_EVENT_DATA_H */ diff --git a/spine-c-new/src/generated/event_queue_entry.h b/spine-c-new/src/generated/event_queue_entry.h index fbc592c81..8c37a8da5 100644 --- a/spine-c-new/src/generated/event_queue_entry.h +++ b/spine-c-new/src/generated/event_queue_entry.h @@ -23,4 +23,4 @@ SPINE_C_API void spine_event_queue_entry_set__event(spine_event_queue_entry self } #endif -#endif /* SPINE_SPINE_EVENT_QUEUE_ENTRY_H */ \ No newline at end of file +#endif /* SPINE_SPINE_EVENT_QUEUE_ENTRY_H */ diff --git a/spine-c-new/src/generated/event_timeline.h b/spine-c-new/src/generated/event_timeline.h index 80a94146e..c1c2939c7 100644 --- a/spine-c-new/src/generated/event_timeline.h +++ b/spine-c-new/src/generated/event_timeline.h @@ -27,4 +27,4 @@ SPINE_C_API spine_rtti spine_event_timeline_rtti(void); } #endif -#endif /* SPINE_SPINE_EVENT_TIMELINE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_EVENT_TIMELINE_H */ diff --git a/spine-c-new/src/generated/event_type.h b/spine-c-new/src/generated/event_type.h index cccf32e65..a245662c7 100644 --- a/spine-c-new/src/generated/event_type.h +++ b/spine-c-new/src/generated/event_type.h @@ -18,4 +18,4 @@ typedef enum spine_event_type { } #endif -#endif /* SPINE_SPINE_EVENT_TYPE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_EVENT_TYPE_H */ diff --git a/spine-c-new/src/generated/format.h b/spine-c-new/src/generated/format.h index ec9513dfb..eac86db5e 100644 --- a/spine-c-new/src/generated/format.h +++ b/spine-c-new/src/generated/format.h @@ -19,4 +19,4 @@ typedef enum spine_format { } #endif -#endif /* SPINE_SPINE_FORMAT_H */ \ No newline at end of file +#endif /* SPINE_SPINE_FORMAT_H */ diff --git a/spine-c-new/src/generated/from_property.h b/spine-c-new/src/generated/from_property.h index 41b696c95..6edc847d8 100644 --- a/spine-c-new/src/generated/from_property.h +++ b/spine-c-new/src/generated/from_property.h @@ -20,4 +20,4 @@ SPINE_C_API void spine_from_property_set__to(spine_from_property self, spine_arr } #endif -#endif /* SPINE_SPINE_FROM_PROPERTY_H */ \ No newline at end of file +#endif /* SPINE_SPINE_FROM_PROPERTY_H */ diff --git a/spine-c-new/src/generated/from_rotate.h b/spine-c-new/src/generated/from_rotate.h index a6fa40ac0..54aac3de5 100644 --- a/spine-c-new/src/generated/from_rotate.h +++ b/spine-c-new/src/generated/from_rotate.h @@ -18,4 +18,4 @@ SPINE_C_API float spine_from_rotate_value(spine_from_rotate self, spine_skeleton } #endif -#endif /* SPINE_SPINE_FROM_ROTATE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_FROM_ROTATE_H */ diff --git a/spine-c-new/src/generated/from_scale_x.h b/spine-c-new/src/generated/from_scale_x.h index 2694bac8c..968ac8fcc 100644 --- a/spine-c-new/src/generated/from_scale_x.h +++ b/spine-c-new/src/generated/from_scale_x.h @@ -18,4 +18,4 @@ SPINE_C_API float spine_from_scale_x_value(spine_from_scale_x self, spine_skelet } #endif -#endif /* SPINE_SPINE_FROM_SCALE_X_H */ \ No newline at end of file +#endif /* SPINE_SPINE_FROM_SCALE_X_H */ diff --git a/spine-c-new/src/generated/from_scale_y.h b/spine-c-new/src/generated/from_scale_y.h index 3a0241afc..a4cd071d7 100644 --- a/spine-c-new/src/generated/from_scale_y.h +++ b/spine-c-new/src/generated/from_scale_y.h @@ -18,4 +18,4 @@ SPINE_C_API float spine_from_scale_y_value(spine_from_scale_y self, spine_skelet } #endif -#endif /* SPINE_SPINE_FROM_SCALE_Y_H */ \ No newline at end of file +#endif /* SPINE_SPINE_FROM_SCALE_Y_H */ diff --git a/spine-c-new/src/generated/from_shear_y.h b/spine-c-new/src/generated/from_shear_y.h index cddfedf1a..064a35ec5 100644 --- a/spine-c-new/src/generated/from_shear_y.h +++ b/spine-c-new/src/generated/from_shear_y.h @@ -18,4 +18,4 @@ SPINE_C_API float spine_from_shear_y_value(spine_from_shear_y self, spine_skelet } #endif -#endif /* SPINE_SPINE_FROM_SHEAR_Y_H */ \ No newline at end of file +#endif /* SPINE_SPINE_FROM_SHEAR_Y_H */ diff --git a/spine-c-new/src/generated/from_x.h b/spine-c-new/src/generated/from_x.h index b78f9fc80..3c18c5ee5 100644 --- a/spine-c-new/src/generated/from_x.h +++ b/spine-c-new/src/generated/from_x.h @@ -18,4 +18,4 @@ SPINE_C_API float spine_from_x_value(spine_from_x self, spine_skeleton skeleton, } #endif -#endif /* SPINE_SPINE_FROM_X_H */ \ No newline at end of file +#endif /* SPINE_SPINE_FROM_X_H */ diff --git a/spine-c-new/src/generated/from_y.h b/spine-c-new/src/generated/from_y.h index 1c7ad269a..5b0f0ada8 100644 --- a/spine-c-new/src/generated/from_y.h +++ b/spine-c-new/src/generated/from_y.h @@ -18,4 +18,4 @@ SPINE_C_API float spine_from_y_value(spine_from_y self, spine_skeleton skeleton, } #endif -#endif /* SPINE_SPINE_FROM_Y_H */ \ No newline at end of file +#endif /* SPINE_SPINE_FROM_Y_H */ diff --git a/spine-c-new/src/generated/ik_constraint.h b/spine-c-new/src/generated/ik_constraint.h index 1470b2085..ed7b53b0b 100644 --- a/spine-c-new/src/generated/ik_constraint.h +++ b/spine-c-new/src/generated/ik_constraint.h @@ -36,4 +36,4 @@ SPINE_C_API spine_rtti spine_ik_constraint_rtti(void); } #endif -#endif /* SPINE_SPINE_IK_CONSTRAINT_H */ \ No newline at end of file +#endif /* SPINE_SPINE_IK_CONSTRAINT_H */ diff --git a/spine-c-new/src/generated/ik_constraint_data.h b/spine-c-new/src/generated/ik_constraint_data.h index ddcaa0b43..8051a90c7 100644 --- a/spine-c-new/src/generated/ik_constraint_data.h +++ b/spine-c-new/src/generated/ik_constraint_data.h @@ -29,4 +29,4 @@ SPINE_C_API spine_rtti spine_ik_constraint_data_rtti(void); } #endif -#endif /* SPINE_SPINE_IK_CONSTRAINT_DATA_H */ \ No newline at end of file +#endif /* SPINE_SPINE_IK_CONSTRAINT_DATA_H */ diff --git a/spine-c-new/src/generated/ik_constraint_pose.h b/spine-c-new/src/generated/ik_constraint_pose.h index 6b1117fae..6a8a3cbac 100644 --- a/spine-c-new/src/generated/ik_constraint_pose.h +++ b/spine-c-new/src/generated/ik_constraint_pose.h @@ -28,4 +28,4 @@ SPINE_C_API void spine_ik_constraint_pose_set_stretch(spine_ik_constraint_pose s } #endif -#endif /* SPINE_SPINE_IK_CONSTRAINT_POSE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_IK_CONSTRAINT_POSE_H */ diff --git a/spine-c-new/src/generated/ik_constraint_timeline.h b/spine-c-new/src/generated/ik_constraint_timeline.h index 6133c10f9..0c769b3da 100644 --- a/spine-c-new/src/generated/ik_constraint_timeline.h +++ b/spine-c-new/src/generated/ik_constraint_timeline.h @@ -33,4 +33,4 @@ SPINE_C_API spine_rtti spine_ik_constraint_timeline_rtti(void); } #endif -#endif /* SPINE_SPINE_IK_CONSTRAINT_TIMELINE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_IK_CONSTRAINT_TIMELINE_H */ diff --git a/spine-c-new/src/generated/inherit.h b/spine-c-new/src/generated/inherit.h index 747d03a35..ad7444748 100644 --- a/spine-c-new/src/generated/inherit.h +++ b/spine-c-new/src/generated/inherit.h @@ -17,4 +17,4 @@ typedef enum spine_inherit { } #endif -#endif /* SPINE_SPINE_INHERIT_H */ \ No newline at end of file +#endif /* SPINE_SPINE_INHERIT_H */ diff --git a/spine-c-new/src/generated/inherit_timeline.h b/spine-c-new/src/generated/inherit_timeline.h index ca563ce5b..706db86c1 100644 --- a/spine-c-new/src/generated/inherit_timeline.h +++ b/spine-c-new/src/generated/inherit_timeline.h @@ -28,4 +28,4 @@ SPINE_C_API spine_rtti spine_inherit_timeline_rtti(void); } #endif -#endif /* SPINE_SPINE_INHERIT_TIMELINE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_INHERIT_TIMELINE_H */ diff --git a/spine-c-new/src/generated/linked_mesh.h b/spine-c-new/src/generated/linked_mesh.h index 818ebadce..3693c5ea0 100644 --- a/spine-c-new/src/generated/linked_mesh.h +++ b/spine-c-new/src/generated/linked_mesh.h @@ -18,4 +18,4 @@ SPINE_C_API void spine_linked_mesh_dispose(spine_linked_mesh self); } #endif -#endif /* SPINE_SPINE_LINKED_MESH_H */ \ No newline at end of file +#endif /* SPINE_SPINE_LINKED_MESH_H */ diff --git a/spine-c-new/src/generated/mesh_attachment.h b/spine-c-new/src/generated/mesh_attachment.h index 86c31cd22..6f02d1e24 100644 --- a/spine-c-new/src/generated/mesh_attachment.h +++ b/spine-c-new/src/generated/mesh_attachment.h @@ -60,4 +60,4 @@ SPINE_C_API spine_rtti spine_mesh_attachment_rtti(void); } #endif -#endif /* SPINE_SPINE_MESH_ATTACHMENT_H */ \ No newline at end of file +#endif /* SPINE_SPINE_MESH_ATTACHMENT_H */ diff --git a/spine-c-new/src/generated/mix_blend.h b/spine-c-new/src/generated/mix_blend.h index 7629a333b..6f79edfb2 100644 --- a/spine-c-new/src/generated/mix_blend.h +++ b/spine-c-new/src/generated/mix_blend.h @@ -16,4 +16,4 @@ typedef enum spine_mix_blend { } #endif -#endif /* SPINE_SPINE_MIX_BLEND_H */ \ No newline at end of file +#endif /* SPINE_SPINE_MIX_BLEND_H */ diff --git a/spine-c-new/src/generated/mix_direction.h b/spine-c-new/src/generated/mix_direction.h index e1c37359e..34a29acf7 100644 --- a/spine-c-new/src/generated/mix_direction.h +++ b/spine-c-new/src/generated/mix_direction.h @@ -14,4 +14,4 @@ typedef enum spine_mix_direction { } #endif -#endif /* SPINE_SPINE_MIX_DIRECTION_H */ \ No newline at end of file +#endif /* SPINE_SPINE_MIX_DIRECTION_H */ diff --git a/spine-c-new/src/generated/path_attachment.h b/spine-c-new/src/generated/path_attachment.h index 0353dd1da..fe20c0cb7 100644 --- a/spine-c-new/src/generated/path_attachment.h +++ b/spine-c-new/src/generated/path_attachment.h @@ -43,4 +43,4 @@ SPINE_C_API spine_rtti spine_path_attachment_rtti(void); } #endif -#endif /* SPINE_SPINE_PATH_ATTACHMENT_H */ \ No newline at end of file +#endif /* SPINE_SPINE_PATH_ATTACHMENT_H */ diff --git a/spine-c-new/src/generated/path_constraint.h b/spine-c-new/src/generated/path_constraint.h index c5c65b351..4fc2fe28b 100644 --- a/spine-c-new/src/generated/path_constraint.h +++ b/spine-c-new/src/generated/path_constraint.h @@ -34,4 +34,4 @@ SPINE_C_API spine_rtti spine_path_constraint_rtti(void); } #endif -#endif /* SPINE_SPINE_PATH_CONSTRAINT_H */ \ No newline at end of file +#endif /* SPINE_SPINE_PATH_CONSTRAINT_H */ diff --git a/spine-c-new/src/generated/path_constraint_data.h b/spine-c-new/src/generated/path_constraint_data.h index 5c6573cfb..349f4e51f 100644 --- a/spine-c-new/src/generated/path_constraint_data.h +++ b/spine-c-new/src/generated/path_constraint_data.h @@ -35,4 +35,4 @@ SPINE_C_API spine_rtti spine_path_constraint_data_rtti(void); } #endif -#endif /* SPINE_SPINE_PATH_CONSTRAINT_DATA_H */ \ No newline at end of file +#endif /* SPINE_SPINE_PATH_CONSTRAINT_DATA_H */ diff --git a/spine-c-new/src/generated/path_constraint_mix_timeline.h b/spine-c-new/src/generated/path_constraint_mix_timeline.h index f2f618ada..ffffb9b70 100644 --- a/spine-c-new/src/generated/path_constraint_mix_timeline.h +++ b/spine-c-new/src/generated/path_constraint_mix_timeline.h @@ -33,4 +33,4 @@ SPINE_C_API spine_rtti spine_path_constraint_mix_timeline_rtti(void); } #endif -#endif /* SPINE_SPINE_PATH_CONSTRAINT_MIX_TIMELINE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_PATH_CONSTRAINT_MIX_TIMELINE_H */ diff --git a/spine-c-new/src/generated/path_constraint_pose.h b/spine-c-new/src/generated/path_constraint_pose.h index 020919b22..671688dc9 100644 --- a/spine-c-new/src/generated/path_constraint_pose.h +++ b/spine-c-new/src/generated/path_constraint_pose.h @@ -28,4 +28,4 @@ SPINE_C_API void spine_path_constraint_pose_set_mix_y(spine_path_constraint_pose } #endif -#endif /* SPINE_SPINE_PATH_CONSTRAINT_POSE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_PATH_CONSTRAINT_POSE_H */ diff --git a/spine-c-new/src/generated/path_constraint_position_timeline.h b/spine-c-new/src/generated/path_constraint_position_timeline.h index 0a9ece80c..66d69440a 100644 --- a/spine-c-new/src/generated/path_constraint_position_timeline.h +++ b/spine-c-new/src/generated/path_constraint_position_timeline.h @@ -38,4 +38,4 @@ SPINE_C_API spine_rtti spine_path_constraint_position_timeline_rtti(void); } #endif -#endif /* SPINE_SPINE_PATH_CONSTRAINT_POSITION_TIMELINE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_PATH_CONSTRAINT_POSITION_TIMELINE_H */ diff --git a/spine-c-new/src/generated/path_constraint_spacing_timeline.h b/spine-c-new/src/generated/path_constraint_spacing_timeline.h index 574026e09..aa5e2e735 100644 --- a/spine-c-new/src/generated/path_constraint_spacing_timeline.h +++ b/spine-c-new/src/generated/path_constraint_spacing_timeline.h @@ -38,4 +38,4 @@ SPINE_C_API spine_rtti spine_path_constraint_spacing_timeline_rtti(void); } #endif -#endif /* SPINE_SPINE_PATH_CONSTRAINT_SPACING_TIMELINE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_PATH_CONSTRAINT_SPACING_TIMELINE_H */ diff --git a/spine-c-new/src/generated/physics.h b/spine-c-new/src/generated/physics.h index fea39baf8..754c48b77 100644 --- a/spine-c-new/src/generated/physics.h +++ b/spine-c-new/src/generated/physics.h @@ -16,4 +16,4 @@ typedef enum spine_physics { } #endif -#endif /* SPINE_SPINE_PHYSICS_H */ \ No newline at end of file +#endif /* SPINE_SPINE_PHYSICS_H */ diff --git a/spine-c-new/src/generated/physics_constraint.h b/spine-c-new/src/generated/physics_constraint.h index 71ac7b82b..36559646c 100644 --- a/spine-c-new/src/generated/physics_constraint.h +++ b/spine-c-new/src/generated/physics_constraint.h @@ -36,4 +36,4 @@ SPINE_C_API spine_rtti spine_physics_constraint_rtti(void); } #endif -#endif /* SPINE_SPINE_PHYSICS_CONSTRAINT_H */ \ No newline at end of file +#endif /* SPINE_SPINE_PHYSICS_CONSTRAINT_H */ diff --git a/spine-c-new/src/generated/physics_constraint_damping_timeline.h b/spine-c-new/src/generated/physics_constraint_damping_timeline.h index 8ad205f48..58c4ed1d3 100644 --- a/spine-c-new/src/generated/physics_constraint_damping_timeline.h +++ b/spine-c-new/src/generated/physics_constraint_damping_timeline.h @@ -38,4 +38,4 @@ SPINE_C_API spine_rtti spine_physics_constraint_damping_timeline_rtti(void); } #endif -#endif /* SPINE_SPINE_PHYSICS_CONSTRAINT_DAMPING_TIMELINE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_PHYSICS_CONSTRAINT_DAMPING_TIMELINE_H */ diff --git a/spine-c-new/src/generated/physics_constraint_data.h b/spine-c-new/src/generated/physics_constraint_data.h index b25f3d9ff..2d6bdc519 100644 --- a/spine-c-new/src/generated/physics_constraint_data.h +++ b/spine-c-new/src/generated/physics_constraint_data.h @@ -54,4 +54,4 @@ SPINE_C_API spine_rtti spine_physics_constraint_data_rtti(void); } #endif -#endif /* SPINE_SPINE_PHYSICS_CONSTRAINT_DATA_H */ \ No newline at end of file +#endif /* SPINE_SPINE_PHYSICS_CONSTRAINT_DATA_H */ diff --git a/spine-c-new/src/generated/physics_constraint_gravity_timeline.h b/spine-c-new/src/generated/physics_constraint_gravity_timeline.h index da612b404..30031c541 100644 --- a/spine-c-new/src/generated/physics_constraint_gravity_timeline.h +++ b/spine-c-new/src/generated/physics_constraint_gravity_timeline.h @@ -38,4 +38,4 @@ SPINE_C_API spine_rtti spine_physics_constraint_gravity_timeline_rtti(void); } #endif -#endif /* SPINE_SPINE_PHYSICS_CONSTRAINT_GRAVITY_TIMELINE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_PHYSICS_CONSTRAINT_GRAVITY_TIMELINE_H */ diff --git a/spine-c-new/src/generated/physics_constraint_inertia_timeline.h b/spine-c-new/src/generated/physics_constraint_inertia_timeline.h index a234baec2..bcca14f68 100644 --- a/spine-c-new/src/generated/physics_constraint_inertia_timeline.h +++ b/spine-c-new/src/generated/physics_constraint_inertia_timeline.h @@ -38,4 +38,4 @@ SPINE_C_API spine_rtti spine_physics_constraint_inertia_timeline_rtti(void); } #endif -#endif /* SPINE_SPINE_PHYSICS_CONSTRAINT_INERTIA_TIMELINE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_PHYSICS_CONSTRAINT_INERTIA_TIMELINE_H */ diff --git a/spine-c-new/src/generated/physics_constraint_mass_timeline.h b/spine-c-new/src/generated/physics_constraint_mass_timeline.h index cb200b742..259385eff 100644 --- a/spine-c-new/src/generated/physics_constraint_mass_timeline.h +++ b/spine-c-new/src/generated/physics_constraint_mass_timeline.h @@ -38,4 +38,4 @@ SPINE_C_API spine_rtti spine_physics_constraint_mass_timeline_rtti(void); } #endif -#endif /* SPINE_SPINE_PHYSICS_CONSTRAINT_MASS_TIMELINE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_PHYSICS_CONSTRAINT_MASS_TIMELINE_H */ diff --git a/spine-c-new/src/generated/physics_constraint_mix_timeline.h b/spine-c-new/src/generated/physics_constraint_mix_timeline.h index 3322e94bc..9841e2942 100644 --- a/spine-c-new/src/generated/physics_constraint_mix_timeline.h +++ b/spine-c-new/src/generated/physics_constraint_mix_timeline.h @@ -38,4 +38,4 @@ SPINE_C_API spine_rtti spine_physics_constraint_mix_timeline_rtti(void); } #endif -#endif /* SPINE_SPINE_PHYSICS_CONSTRAINT_MIX_TIMELINE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_PHYSICS_CONSTRAINT_MIX_TIMELINE_H */ diff --git a/spine-c-new/src/generated/physics_constraint_pose.h b/spine-c-new/src/generated/physics_constraint_pose.h index c67c393fe..e8800aeaf 100644 --- a/spine-c-new/src/generated/physics_constraint_pose.h +++ b/spine-c-new/src/generated/physics_constraint_pose.h @@ -32,4 +32,4 @@ SPINE_C_API void spine_physics_constraint_pose_set_mix(spine_physics_constraint_ } #endif -#endif /* SPINE_SPINE_PHYSICS_CONSTRAINT_POSE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_PHYSICS_CONSTRAINT_POSE_H */ diff --git a/spine-c-new/src/generated/physics_constraint_reset_timeline.h b/spine-c-new/src/generated/physics_constraint_reset_timeline.h index 4d14361a6..f796803e7 100644 --- a/spine-c-new/src/generated/physics_constraint_reset_timeline.h +++ b/spine-c-new/src/generated/physics_constraint_reset_timeline.h @@ -28,4 +28,4 @@ SPINE_C_API spine_rtti spine_physics_constraint_reset_timeline_rtti(void); } #endif -#endif /* SPINE_SPINE_PHYSICS_CONSTRAINT_RESET_TIMELINE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_PHYSICS_CONSTRAINT_RESET_TIMELINE_H */ diff --git a/spine-c-new/src/generated/physics_constraint_strength_timeline.h b/spine-c-new/src/generated/physics_constraint_strength_timeline.h index c56f2dc48..0c757f3a3 100644 --- a/spine-c-new/src/generated/physics_constraint_strength_timeline.h +++ b/spine-c-new/src/generated/physics_constraint_strength_timeline.h @@ -38,4 +38,4 @@ SPINE_C_API spine_rtti spine_physics_constraint_strength_timeline_rtti(void); } #endif -#endif /* SPINE_SPINE_PHYSICS_CONSTRAINT_STRENGTH_TIMELINE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_PHYSICS_CONSTRAINT_STRENGTH_TIMELINE_H */ diff --git a/spine-c-new/src/generated/physics_constraint_timeline.h b/spine-c-new/src/generated/physics_constraint_timeline.h index ee81c00bf..31d68351a 100644 --- a/spine-c-new/src/generated/physics_constraint_timeline.h +++ b/spine-c-new/src/generated/physics_constraint_timeline.h @@ -36,4 +36,4 @@ SPINE_C_API spine_rtti spine_physics_constraint_timeline_rtti(void); } #endif -#endif /* SPINE_SPINE_PHYSICS_CONSTRAINT_TIMELINE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_PHYSICS_CONSTRAINT_TIMELINE_H */ diff --git a/spine-c-new/src/generated/physics_constraint_wind_timeline.h b/spine-c-new/src/generated/physics_constraint_wind_timeline.h index 52d7cf3c6..5875ed285 100644 --- a/spine-c-new/src/generated/physics_constraint_wind_timeline.h +++ b/spine-c-new/src/generated/physics_constraint_wind_timeline.h @@ -38,4 +38,4 @@ SPINE_C_API spine_rtti spine_physics_constraint_wind_timeline_rtti(void); } #endif -#endif /* SPINE_SPINE_PHYSICS_CONSTRAINT_WIND_TIMELINE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_PHYSICS_CONSTRAINT_WIND_TIMELINE_H */ diff --git a/spine-c-new/src/generated/point_attachment.h b/spine-c-new/src/generated/point_attachment.h index da5b90847..c4d6b1a14 100644 --- a/spine-c-new/src/generated/point_attachment.h +++ b/spine-c-new/src/generated/point_attachment.h @@ -33,4 +33,4 @@ SPINE_C_API spine_rtti spine_point_attachment_rtti(void); } #endif -#endif /* SPINE_SPINE_POINT_ATTACHMENT_H */ \ No newline at end of file +#endif /* SPINE_SPINE_POINT_ATTACHMENT_H */ diff --git a/spine-c-new/src/generated/polygon.h b/spine-c-new/src/generated/polygon.h index 939231dc4..4dd7bfe0b 100644 --- a/spine-c-new/src/generated/polygon.h +++ b/spine-c-new/src/generated/polygon.h @@ -21,4 +21,4 @@ SPINE_C_API void spine_polygon_set__count(spine_polygon self, int value); } #endif -#endif /* SPINE_SPINE_POLYGON_H */ \ No newline at end of file +#endif /* SPINE_SPINE_POLYGON_H */ diff --git a/spine-c-new/src/generated/posed.h b/spine-c-new/src/generated/posed.h index fa919e7ff..c9d16034e 100644 --- a/spine-c-new/src/generated/posed.h +++ b/spine-c-new/src/generated/posed.h @@ -18,4 +18,4 @@ SPINE_C_API bool spine_posed_is_pose_equal_to_applied(spine_posed self); } #endif -#endif /* SPINE_SPINE_POSED_H */ \ No newline at end of file +#endif /* SPINE_SPINE_POSED_H */ diff --git a/spine-c-new/src/generated/posed_active.h b/spine-c-new/src/generated/posed_active.h index 0bf04fc55..8bf6a487b 100644 --- a/spine-c-new/src/generated/posed_active.h +++ b/spine-c-new/src/generated/posed_active.h @@ -17,4 +17,4 @@ SPINE_C_API void spine_posed_active_set_active(spine_posed_active self, bool act } #endif -#endif /* SPINE_SPINE_POSED_ACTIVE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_POSED_ACTIVE_H */ diff --git a/spine-c-new/src/generated/posed_data.h b/spine-c-new/src/generated/posed_data.h index fdc605837..16fb54a4e 100644 --- a/spine-c-new/src/generated/posed_data.h +++ b/spine-c-new/src/generated/posed_data.h @@ -20,4 +20,4 @@ SPINE_C_API void spine_posed_data_set_skin_required(spine_posed_data self, bool } #endif -#endif /* SPINE_SPINE_POSED_DATA_H */ \ No newline at end of file +#endif /* SPINE_SPINE_POSED_DATA_H */ diff --git a/spine-c-new/src/generated/position_mode.h b/spine-c-new/src/generated/position_mode.h index 0a3091481..6addb3a1c 100644 --- a/spine-c-new/src/generated/position_mode.h +++ b/spine-c-new/src/generated/position_mode.h @@ -14,4 +14,4 @@ typedef enum spine_position_mode { } #endif -#endif /* SPINE_SPINE_POSITION_MODE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_POSITION_MODE_H */ diff --git a/spine-c-new/src/generated/property.h b/spine-c-new/src/generated/property.h index 211ec3610..f18af4455 100644 --- a/spine-c-new/src/generated/property.h +++ b/spine-c-new/src/generated/property.h @@ -43,4 +43,4 @@ typedef enum spine_property { } #endif -#endif /* SPINE_SPINE_PROPERTY_H */ \ No newline at end of file +#endif /* SPINE_SPINE_PROPERTY_H */ diff --git a/spine-c-new/src/generated/region_attachment.h b/spine-c-new/src/generated/region_attachment.h index d87524b02..3b1e2d975 100644 --- a/spine-c-new/src/generated/region_attachment.h +++ b/spine-c-new/src/generated/region_attachment.h @@ -50,4 +50,4 @@ SPINE_C_API spine_rtti spine_region_attachment_rtti(void); } #endif -#endif /* SPINE_SPINE_REGION_ATTACHMENT_H */ \ No newline at end of file +#endif /* SPINE_SPINE_REGION_ATTACHMENT_H */ diff --git a/spine-c-new/src/generated/render_command.h b/spine-c-new/src/generated/render_command.h index 3e1056965..52d8b031e 100644 --- a/spine-c-new/src/generated/render_command.h +++ b/spine-c-new/src/generated/render_command.h @@ -25,4 +25,4 @@ SPINE_C_API spine_render_command spine_render_command_get_next(spine_render_comm } #endif -#endif /* SPINE_SPINE_RENDER_COMMAND_H */ \ No newline at end of file +#endif /* SPINE_SPINE_RENDER_COMMAND_H */ diff --git a/spine-c-new/src/generated/rgb2_timeline.h b/spine-c-new/src/generated/rgb2_timeline.h index ab0c4af6f..fb8a9072c 100644 --- a/spine-c-new/src/generated/rgb2_timeline.h +++ b/spine-c-new/src/generated/rgb2_timeline.h @@ -33,4 +33,4 @@ SPINE_C_API spine_rtti spine_rgb2_timeline_rtti(void); } #endif -#endif /* SPINE_SPINE_RGB2_TIMELINE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_RGB2_TIMELINE_H */ diff --git a/spine-c-new/src/generated/rgb_timeline.h b/spine-c-new/src/generated/rgb_timeline.h index b2deda910..892c9c2bd 100644 --- a/spine-c-new/src/generated/rgb_timeline.h +++ b/spine-c-new/src/generated/rgb_timeline.h @@ -33,4 +33,4 @@ SPINE_C_API spine_rtti spine_rgb_timeline_rtti(void); } #endif -#endif /* SPINE_SPINE_RGB_TIMELINE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_RGB_TIMELINE_H */ diff --git a/spine-c-new/src/generated/rgba2_timeline.h b/spine-c-new/src/generated/rgba2_timeline.h index d72e7fcea..e57435dda 100644 --- a/spine-c-new/src/generated/rgba2_timeline.h +++ b/spine-c-new/src/generated/rgba2_timeline.h @@ -33,4 +33,4 @@ SPINE_C_API spine_rtti spine_rgba2_timeline_rtti(void); } #endif -#endif /* SPINE_SPINE_RGBA2_TIMELINE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_RGBA2_TIMELINE_H */ diff --git a/spine-c-new/src/generated/rgba_timeline.h b/spine-c-new/src/generated/rgba_timeline.h index 64e9548a0..919c9e076 100644 --- a/spine-c-new/src/generated/rgba_timeline.h +++ b/spine-c-new/src/generated/rgba_timeline.h @@ -33,4 +33,4 @@ SPINE_C_API spine_rtti spine_rgba_timeline_rtti(void); } #endif -#endif /* SPINE_SPINE_RGBA_TIMELINE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_RGBA_TIMELINE_H */ diff --git a/spine-c-new/src/generated/rotate_mode.h b/spine-c-new/src/generated/rotate_mode.h index f85c80f26..611df6170 100644 --- a/spine-c-new/src/generated/rotate_mode.h +++ b/spine-c-new/src/generated/rotate_mode.h @@ -15,4 +15,4 @@ typedef enum spine_rotate_mode { } #endif -#endif /* SPINE_SPINE_ROTATE_MODE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_ROTATE_MODE_H */ diff --git a/spine-c-new/src/generated/rotate_timeline.h b/spine-c-new/src/generated/rotate_timeline.h index b0b6e15fd..aff950154 100644 --- a/spine-c-new/src/generated/rotate_timeline.h +++ b/spine-c-new/src/generated/rotate_timeline.h @@ -38,4 +38,4 @@ SPINE_C_API spine_rtti spine_rotate_timeline_rtti(void); } #endif -#endif /* SPINE_SPINE_ROTATE_TIMELINE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_ROTATE_TIMELINE_H */ diff --git a/spine-c-new/src/generated/rtti.h b/spine-c-new/src/generated/rtti.h index 6bb29a008..3dfe10d37 100644 --- a/spine-c-new/src/generated/rtti.h +++ b/spine-c-new/src/generated/rtti.h @@ -18,4 +18,4 @@ SPINE_C_API bool spine_rtti_instance_of(spine_rtti self, spine_rtti rtti); } #endif -#endif /* SPINE_SPINE_RTTI_H */ \ No newline at end of file +#endif /* SPINE_SPINE_RTTI_H */ diff --git a/spine-c-new/src/generated/scale_timeline.h b/spine-c-new/src/generated/scale_timeline.h index d7f2de6bc..a0fd57420 100644 --- a/spine-c-new/src/generated/scale_timeline.h +++ b/spine-c-new/src/generated/scale_timeline.h @@ -34,4 +34,4 @@ SPINE_C_API spine_rtti spine_scale_timeline_rtti(void); } #endif -#endif /* SPINE_SPINE_SCALE_TIMELINE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_SCALE_TIMELINE_H */ diff --git a/spine-c-new/src/generated/scale_x_timeline.h b/spine-c-new/src/generated/scale_x_timeline.h index 9468f4795..f2a174455 100644 --- a/spine-c-new/src/generated/scale_x_timeline.h +++ b/spine-c-new/src/generated/scale_x_timeline.h @@ -38,4 +38,4 @@ SPINE_C_API spine_rtti spine_scale_x_timeline_rtti(void); } #endif -#endif /* SPINE_SPINE_SCALE_X_TIMELINE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_SCALE_X_TIMELINE_H */ diff --git a/spine-c-new/src/generated/scale_y_timeline.h b/spine-c-new/src/generated/scale_y_timeline.h index 74074c94d..f75eba022 100644 --- a/spine-c-new/src/generated/scale_y_timeline.h +++ b/spine-c-new/src/generated/scale_y_timeline.h @@ -38,4 +38,4 @@ SPINE_C_API spine_rtti spine_scale_y_timeline_rtti(void); } #endif -#endif /* SPINE_SPINE_SCALE_Y_TIMELINE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_SCALE_Y_TIMELINE_H */ diff --git a/spine-c-new/src/generated/sequence.h b/spine-c-new/src/generated/sequence.h index 72ed546b7..d5e5df5ee 100644 --- a/spine-c-new/src/generated/sequence.h +++ b/spine-c-new/src/generated/sequence.h @@ -29,4 +29,4 @@ SPINE_C_API spine_array_texture_region spine_sequence_get_regions(spine_sequence } #endif -#endif /* SPINE_SPINE_SEQUENCE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_SEQUENCE_H */ diff --git a/spine-c-new/src/generated/sequence_mode.h b/spine-c-new/src/generated/sequence_mode.h index b50d490ae..4a40ac7fe 100644 --- a/spine-c-new/src/generated/sequence_mode.h +++ b/spine-c-new/src/generated/sequence_mode.h @@ -19,4 +19,4 @@ typedef enum spine_sequence_mode { } #endif -#endif /* SPINE_SPINE_SEQUENCE_MODE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_SEQUENCE_MODE_H */ diff --git a/spine-c-new/src/generated/sequence_timeline.h b/spine-c-new/src/generated/sequence_timeline.h index 7a14039f5..b32419d45 100644 --- a/spine-c-new/src/generated/sequence_timeline.h +++ b/spine-c-new/src/generated/sequence_timeline.h @@ -29,4 +29,4 @@ SPINE_C_API spine_rtti spine_sequence_timeline_rtti(void); } #endif -#endif /* SPINE_SPINE_SEQUENCE_TIMELINE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_SEQUENCE_TIMELINE_H */ diff --git a/spine-c-new/src/generated/shear_timeline.h b/spine-c-new/src/generated/shear_timeline.h index c34b463ee..f6f05683c 100644 --- a/spine-c-new/src/generated/shear_timeline.h +++ b/spine-c-new/src/generated/shear_timeline.h @@ -34,4 +34,4 @@ SPINE_C_API spine_rtti spine_shear_timeline_rtti(void); } #endif -#endif /* SPINE_SPINE_SHEAR_TIMELINE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_SHEAR_TIMELINE_H */ diff --git a/spine-c-new/src/generated/shear_x_timeline.h b/spine-c-new/src/generated/shear_x_timeline.h index 05f9c47cd..bb8c81d18 100644 --- a/spine-c-new/src/generated/shear_x_timeline.h +++ b/spine-c-new/src/generated/shear_x_timeline.h @@ -38,4 +38,4 @@ SPINE_C_API spine_rtti spine_shear_x_timeline_rtti(void); } #endif -#endif /* SPINE_SPINE_SHEAR_X_TIMELINE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_SHEAR_X_TIMELINE_H */ diff --git a/spine-c-new/src/generated/shear_y_timeline.h b/spine-c-new/src/generated/shear_y_timeline.h index 7a7ead79f..12355b8e9 100644 --- a/spine-c-new/src/generated/shear_y_timeline.h +++ b/spine-c-new/src/generated/shear_y_timeline.h @@ -38,4 +38,4 @@ SPINE_C_API spine_rtti spine_shear_y_timeline_rtti(void); } #endif -#endif /* SPINE_SPINE_SHEAR_Y_TIMELINE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_SHEAR_Y_TIMELINE_H */ diff --git a/spine-c-new/src/generated/skeleton.h b/spine-c-new/src/generated/skeleton.h index aac265657..86d017db3 100644 --- a/spine-c-new/src/generated/skeleton.h +++ b/spine-c-new/src/generated/skeleton.h @@ -71,4 +71,4 @@ SPINE_C_API void spine_skeleton_update(spine_skeleton self, float delta); } #endif -#endif /* SPINE_SPINE_SKELETON_H */ \ No newline at end of file +#endif /* SPINE_SPINE_SKELETON_H */ diff --git a/spine-c-new/src/generated/skeleton_binary.h b/spine-c-new/src/generated/skeleton_binary.h index 57c600194..57ed99f1a 100644 --- a/spine-c-new/src/generated/skeleton_binary.h +++ b/spine-c-new/src/generated/skeleton_binary.h @@ -22,4 +22,4 @@ SPINE_C_API const char* spine_skeleton_binary_get_error(spine_skeleton_binary se } #endif -#endif /* SPINE_SPINE_SKELETON_BINARY_H */ \ No newline at end of file +#endif /* SPINE_SPINE_SKELETON_BINARY_H */ diff --git a/spine-c-new/src/generated/skeleton_bounds.h b/spine-c-new/src/generated/skeleton_bounds.h index 5da7a3595..e0d019463 100644 --- a/spine-c-new/src/generated/skeleton_bounds.h +++ b/spine-c-new/src/generated/skeleton_bounds.h @@ -35,4 +35,4 @@ SPINE_C_API float spine_skeleton_bounds_get_height(spine_skeleton_bounds self); } #endif -#endif /* SPINE_SPINE_SKELETON_BOUNDS_H */ \ No newline at end of file +#endif /* SPINE_SPINE_SKELETON_BOUNDS_H */ diff --git a/spine-c-new/src/generated/skeleton_clipping.h b/spine-c-new/src/generated/skeleton_clipping.h index 6a3cffcea..c2de7d18d 100644 --- a/spine-c-new/src/generated/skeleton_clipping.h +++ b/spine-c-new/src/generated/skeleton_clipping.h @@ -27,4 +27,4 @@ SPINE_C_API spine_array_float spine_skeleton_clipping_get_clipped_u_vs(spine_ske } #endif -#endif /* SPINE_SPINE_SKELETON_CLIPPING_H */ \ No newline at end of file +#endif /* SPINE_SPINE_SKELETON_CLIPPING_H */ diff --git a/spine-c-new/src/generated/skeleton_data.h b/spine-c-new/src/generated/skeleton_data.h index 84835a929..5fa1a2935 100644 --- a/spine-c-new/src/generated/skeleton_data.h +++ b/spine-c-new/src/generated/skeleton_data.h @@ -60,4 +60,4 @@ SPINE_C_API void spine_skeleton_data_set_fps(spine_skeleton_data self, float inV } #endif -#endif /* SPINE_SPINE_SKELETON_DATA_H */ \ No newline at end of file +#endif /* SPINE_SPINE_SKELETON_DATA_H */ diff --git a/spine-c-new/src/generated/skeleton_json.h b/spine-c-new/src/generated/skeleton_json.h index f8dbac933..1e4a89655 100644 --- a/spine-c-new/src/generated/skeleton_json.h +++ b/spine-c-new/src/generated/skeleton_json.h @@ -22,4 +22,4 @@ SPINE_C_API const char* spine_skeleton_json_get_error(spine_skeleton_json self); } #endif -#endif /* SPINE_SPINE_SKELETON_JSON_H */ \ No newline at end of file +#endif /* SPINE_SPINE_SKELETON_JSON_H */ diff --git a/spine-c-new/src/generated/skeleton_renderer.h b/spine-c-new/src/generated/skeleton_renderer.h index 0ebc5e4be..56c3cf528 100644 --- a/spine-c-new/src/generated/skeleton_renderer.h +++ b/spine-c-new/src/generated/skeleton_renderer.h @@ -18,4 +18,4 @@ SPINE_C_API spine_render_command spine_skeleton_renderer_render(spine_skeleton_r } #endif -#endif /* SPINE_SPINE_SKELETON_RENDERER_H */ \ No newline at end of file +#endif /* SPINE_SPINE_SKELETON_RENDERER_H */ diff --git a/spine-c-new/src/generated/skin.h b/spine-c-new/src/generated/skin.h index 7311b599c..e5f2f2f29 100644 --- a/spine-c-new/src/generated/skin.h +++ b/spine-c-new/src/generated/skin.h @@ -27,4 +27,4 @@ SPINE_C_API spine_color spine_skin_get_color(spine_skin self); } #endif -#endif /* SPINE_SPINE_SKIN_H */ \ No newline at end of file +#endif /* SPINE_SPINE_SKIN_H */ diff --git a/spine-c-new/src/generated/slider.h b/spine-c-new/src/generated/slider.h index 88bfc3999..cced1a27a 100644 --- a/spine-c-new/src/generated/slider.h +++ b/spine-c-new/src/generated/slider.h @@ -33,4 +33,4 @@ SPINE_C_API spine_rtti spine_slider_rtti(void); } #endif -#endif /* SPINE_SPINE_SLIDER_H */ \ No newline at end of file +#endif /* SPINE_SPINE_SLIDER_H */ diff --git a/spine-c-new/src/generated/slider_data.h b/spine-c-new/src/generated/slider_data.h index f72af0c97..45973dcd7 100644 --- a/spine-c-new/src/generated/slider_data.h +++ b/spine-c-new/src/generated/slider_data.h @@ -40,4 +40,4 @@ SPINE_C_API spine_rtti spine_slider_data_rtti(void); } #endif -#endif /* SPINE_SPINE_SLIDER_DATA_H */ \ No newline at end of file +#endif /* SPINE_SPINE_SLIDER_DATA_H */ diff --git a/spine-c-new/src/generated/slider_mix_timeline.h b/spine-c-new/src/generated/slider_mix_timeline.h index dabe3bd81..83a979039 100644 --- a/spine-c-new/src/generated/slider_mix_timeline.h +++ b/spine-c-new/src/generated/slider_mix_timeline.h @@ -38,4 +38,4 @@ SPINE_C_API spine_rtti spine_slider_mix_timeline_rtti(void); } #endif -#endif /* SPINE_SPINE_SLIDER_MIX_TIMELINE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_SLIDER_MIX_TIMELINE_H */ diff --git a/spine-c-new/src/generated/slider_pose.h b/spine-c-new/src/generated/slider_pose.h index 3502c7422..57bdb7943 100644 --- a/spine-c-new/src/generated/slider_pose.h +++ b/spine-c-new/src/generated/slider_pose.h @@ -22,4 +22,4 @@ SPINE_C_API void spine_slider_pose_set_mix(spine_slider_pose self, float mix); } #endif -#endif /* SPINE_SPINE_SLIDER_POSE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_SLIDER_POSE_H */ diff --git a/spine-c-new/src/generated/slider_timeline.h b/spine-c-new/src/generated/slider_timeline.h index 5aa2e9ac2..005744eea 100644 --- a/spine-c-new/src/generated/slider_timeline.h +++ b/spine-c-new/src/generated/slider_timeline.h @@ -38,4 +38,4 @@ SPINE_C_API spine_rtti spine_slider_timeline_rtti(void); } #endif -#endif /* SPINE_SPINE_SLIDER_TIMELINE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_SLIDER_TIMELINE_H */ diff --git a/spine-c-new/src/generated/slot.h b/spine-c-new/src/generated/slot.h index c8172c015..52c7ef7f9 100644 --- a/spine-c-new/src/generated/slot.h +++ b/spine-c-new/src/generated/slot.h @@ -25,4 +25,4 @@ SPINE_C_API bool spine_slot_is_pose_equal_to_applied(spine_slot self); } #endif -#endif /* SPINE_SPINE_SLOT_H */ \ No newline at end of file +#endif /* SPINE_SPINE_SLOT_H */ diff --git a/spine-c-new/src/generated/slot_curve_timeline.h b/spine-c-new/src/generated/slot_curve_timeline.h index b2090952c..3a447c369 100644 --- a/spine-c-new/src/generated/slot_curve_timeline.h +++ b/spine-c-new/src/generated/slot_curve_timeline.h @@ -30,4 +30,4 @@ SPINE_C_API spine_rtti spine_slot_curve_timeline_rtti(void); } #endif -#endif /* SPINE_SPINE_SLOT_CURVE_TIMELINE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_SLOT_CURVE_TIMELINE_H */ diff --git a/spine-c-new/src/generated/slot_data.h b/spine-c-new/src/generated/slot_data.h index d5db85ac6..ad879f26c 100644 --- a/spine-c-new/src/generated/slot_data.h +++ b/spine-c-new/src/generated/slot_data.h @@ -29,4 +29,4 @@ SPINE_C_API void spine_slot_data_set_skin_required(spine_slot_data self, bool sk } #endif -#endif /* SPINE_SPINE_SLOT_DATA_H */ \ No newline at end of file +#endif /* SPINE_SPINE_SLOT_DATA_H */ diff --git a/spine-c-new/src/generated/slot_pose.h b/spine-c-new/src/generated/slot_pose.h index d8b4807fe..90577ebe9 100644 --- a/spine-c-new/src/generated/slot_pose.h +++ b/spine-c-new/src/generated/slot_pose.h @@ -27,4 +27,4 @@ SPINE_C_API spine_array_float spine_slot_pose_get_deform(spine_slot_pose self); } #endif -#endif /* SPINE_SPINE_SLOT_POSE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_SLOT_POSE_H */ diff --git a/spine-c-new/src/generated/slot_timeline.h b/spine-c-new/src/generated/slot_timeline.h index b105bf06e..70befdfae 100644 --- a/spine-c-new/src/generated/slot_timeline.h +++ b/spine-c-new/src/generated/slot_timeline.h @@ -19,4 +19,4 @@ SPINE_C_API spine_rtti spine_slot_timeline_rtti(void); } #endif -#endif /* SPINE_SPINE_SLOT_TIMELINE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_SLOT_TIMELINE_H */ diff --git a/spine-c-new/src/generated/spacing_mode.h b/spine-c-new/src/generated/spacing_mode.h index 028793e08..a944521de 100644 --- a/spine-c-new/src/generated/spacing_mode.h +++ b/spine-c-new/src/generated/spacing_mode.h @@ -16,4 +16,4 @@ typedef enum spine_spacing_mode { } #endif -#endif /* SPINE_SPINE_SPACING_MODE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_SPACING_MODE_H */ diff --git a/spine-c-new/src/generated/texture_filter.h b/spine-c-new/src/generated/texture_filter.h index ca9792c3c..f3f95a468 100644 --- a/spine-c-new/src/generated/texture_filter.h +++ b/spine-c-new/src/generated/texture_filter.h @@ -20,4 +20,4 @@ typedef enum spine_texture_filter { } #endif -#endif /* SPINE_SPINE_TEXTURE_FILTER_H */ \ No newline at end of file +#endif /* SPINE_SPINE_TEXTURE_FILTER_H */ diff --git a/spine-c-new/src/generated/texture_region.h b/spine-c-new/src/generated/texture_region.h index 4af6ffb1e..2300b3394 100644 --- a/spine-c-new/src/generated/texture_region.h +++ b/spine-c-new/src/generated/texture_region.h @@ -41,4 +41,4 @@ SPINE_C_API void spine_texture_region_set_original_height(spine_texture_region s } #endif -#endif /* SPINE_SPINE_TEXTURE_REGION_H */ \ No newline at end of file +#endif /* SPINE_SPINE_TEXTURE_REGION_H */ diff --git a/spine-c-new/src/generated/texture_wrap.h b/spine-c-new/src/generated/texture_wrap.h index 44fbf7cf3..928430c61 100644 --- a/spine-c-new/src/generated/texture_wrap.h +++ b/spine-c-new/src/generated/texture_wrap.h @@ -15,4 +15,4 @@ typedef enum spine_texture_wrap { } #endif -#endif /* SPINE_SPINE_TEXTURE_WRAP_H */ \ No newline at end of file +#endif /* SPINE_SPINE_TEXTURE_WRAP_H */ diff --git a/spine-c-new/src/generated/timeline.h b/spine-c-new/src/generated/timeline.h index ffb4060c9..7b2973a7c 100644 --- a/spine-c-new/src/generated/timeline.h +++ b/spine-c-new/src/generated/timeline.h @@ -23,4 +23,4 @@ SPINE_C_API spine_rtti spine_timeline_rtti(void); } #endif -#endif /* SPINE_SPINE_TIMELINE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_TIMELINE_H */ diff --git a/spine-c-new/src/generated/to_property.h b/spine-c-new/src/generated/to_property.h index 45fb077c0..f36bca630 100644 --- a/spine-c-new/src/generated/to_property.h +++ b/spine-c-new/src/generated/to_property.h @@ -23,4 +23,4 @@ SPINE_C_API void spine_to_property_set__scale(spine_to_property self, float valu } #endif -#endif /* SPINE_SPINE_TO_PROPERTY_H */ \ No newline at end of file +#endif /* SPINE_SPINE_TO_PROPERTY_H */ diff --git a/spine-c-new/src/generated/to_rotate.h b/spine-c-new/src/generated/to_rotate.h index ec0141882..e4e5a5c43 100644 --- a/spine-c-new/src/generated/to_rotate.h +++ b/spine-c-new/src/generated/to_rotate.h @@ -19,4 +19,4 @@ SPINE_C_API void spine_to_rotate_apply(spine_to_rotate self, spine_skeleton skel } #endif -#endif /* SPINE_SPINE_TO_ROTATE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_TO_ROTATE_H */ diff --git a/spine-c-new/src/generated/to_scale_x.h b/spine-c-new/src/generated/to_scale_x.h index 27b0dd43e..edf0c91d6 100644 --- a/spine-c-new/src/generated/to_scale_x.h +++ b/spine-c-new/src/generated/to_scale_x.h @@ -19,4 +19,4 @@ SPINE_C_API void spine_to_scale_x_apply(spine_to_scale_x self, spine_skeleton sk } #endif -#endif /* SPINE_SPINE_TO_SCALE_X_H */ \ No newline at end of file +#endif /* SPINE_SPINE_TO_SCALE_X_H */ diff --git a/spine-c-new/src/generated/to_scale_y.h b/spine-c-new/src/generated/to_scale_y.h index 1944658da..4959b4925 100644 --- a/spine-c-new/src/generated/to_scale_y.h +++ b/spine-c-new/src/generated/to_scale_y.h @@ -19,4 +19,4 @@ SPINE_C_API void spine_to_scale_y_apply(spine_to_scale_y self, spine_skeleton sk } #endif -#endif /* SPINE_SPINE_TO_SCALE_Y_H */ \ No newline at end of file +#endif /* SPINE_SPINE_TO_SCALE_Y_H */ diff --git a/spine-c-new/src/generated/to_shear_y.h b/spine-c-new/src/generated/to_shear_y.h index 8df8a4236..64bc6e3b3 100644 --- a/spine-c-new/src/generated/to_shear_y.h +++ b/spine-c-new/src/generated/to_shear_y.h @@ -19,4 +19,4 @@ SPINE_C_API void spine_to_shear_y_apply(spine_to_shear_y self, spine_skeleton sk } #endif -#endif /* SPINE_SPINE_TO_SHEAR_Y_H */ \ No newline at end of file +#endif /* SPINE_SPINE_TO_SHEAR_Y_H */ diff --git a/spine-c-new/src/generated/to_x.h b/spine-c-new/src/generated/to_x.h index 6b543787e..b45ca8b60 100644 --- a/spine-c-new/src/generated/to_x.h +++ b/spine-c-new/src/generated/to_x.h @@ -19,4 +19,4 @@ SPINE_C_API void spine_to_x_apply(spine_to_x self, spine_skeleton skeleton, spin } #endif -#endif /* SPINE_SPINE_TO_X_H */ \ No newline at end of file +#endif /* SPINE_SPINE_TO_X_H */ diff --git a/spine-c-new/src/generated/to_y.h b/spine-c-new/src/generated/to_y.h index f392afa63..264c7f7af 100644 --- a/spine-c-new/src/generated/to_y.h +++ b/spine-c-new/src/generated/to_y.h @@ -19,4 +19,4 @@ SPINE_C_API void spine_to_y_apply(spine_to_y self, spine_skeleton skeleton, spin } #endif -#endif /* SPINE_SPINE_TO_Y_H */ \ No newline at end of file +#endif /* SPINE_SPINE_TO_Y_H */ diff --git a/spine-c-new/src/generated/track_entry.h b/spine-c-new/src/generated/track_entry.h index ee1b15702..18048fb23 100644 --- a/spine-c-new/src/generated/track_entry.h +++ b/spine-c-new/src/generated/track_entry.h @@ -71,4 +71,4 @@ SPINE_C_API void * spine_track_entry_get_renderer_object(spine_track_entry self) } #endif -#endif /* SPINE_SPINE_TRACK_ENTRY_H */ \ No newline at end of file +#endif /* SPINE_SPINE_TRACK_ENTRY_H */ diff --git a/spine-c-new/src/generated/transform_constraint.h b/spine-c-new/src/generated/transform_constraint.h index 19ab44d84..547af06b7 100644 --- a/spine-c-new/src/generated/transform_constraint.h +++ b/spine-c-new/src/generated/transform_constraint.h @@ -34,4 +34,4 @@ SPINE_C_API spine_rtti spine_transform_constraint_rtti(void); } #endif -#endif /* SPINE_SPINE_TRANSFORM_CONSTRAINT_H */ \ No newline at end of file +#endif /* SPINE_SPINE_TRANSFORM_CONSTRAINT_H */ diff --git a/spine-c-new/src/generated/transform_constraint_data.h b/spine-c-new/src/generated/transform_constraint_data.h index 40a9ecb37..10ed79be2 100644 --- a/spine-c-new/src/generated/transform_constraint_data.h +++ b/spine-c-new/src/generated/transform_constraint_data.h @@ -48,4 +48,4 @@ SPINE_C_API spine_rtti spine_transform_constraint_data_rtti(void); } #endif -#endif /* SPINE_SPINE_TRANSFORM_CONSTRAINT_DATA_H */ \ No newline at end of file +#endif /* SPINE_SPINE_TRANSFORM_CONSTRAINT_DATA_H */ diff --git a/spine-c-new/src/generated/transform_constraint_pose.h b/spine-c-new/src/generated/transform_constraint_pose.h index 583b13b90..cd78db3b1 100644 --- a/spine-c-new/src/generated/transform_constraint_pose.h +++ b/spine-c-new/src/generated/transform_constraint_pose.h @@ -30,4 +30,4 @@ SPINE_C_API void spine_transform_constraint_pose_set_mix_shear_y(spine_transform } #endif -#endif /* SPINE_SPINE_TRANSFORM_CONSTRAINT_POSE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_TRANSFORM_CONSTRAINT_POSE_H */ diff --git a/spine-c-new/src/generated/transform_constraint_timeline.h b/spine-c-new/src/generated/transform_constraint_timeline.h index 96a336ddb..1cde58b47 100644 --- a/spine-c-new/src/generated/transform_constraint_timeline.h +++ b/spine-c-new/src/generated/transform_constraint_timeline.h @@ -33,4 +33,4 @@ SPINE_C_API spine_rtti spine_transform_constraint_timeline_rtti(void); } #endif -#endif /* SPINE_SPINE_TRANSFORM_CONSTRAINT_TIMELINE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_TRANSFORM_CONSTRAINT_TIMELINE_H */ diff --git a/spine-c-new/src/generated/translate_timeline.h b/spine-c-new/src/generated/translate_timeline.h index ebf00aeaa..3a84f1fd7 100644 --- a/spine-c-new/src/generated/translate_timeline.h +++ b/spine-c-new/src/generated/translate_timeline.h @@ -34,4 +34,4 @@ SPINE_C_API spine_rtti spine_translate_timeline_rtti(void); } #endif -#endif /* SPINE_SPINE_TRANSLATE_TIMELINE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_TRANSLATE_TIMELINE_H */ diff --git a/spine-c-new/src/generated/translate_x_timeline.h b/spine-c-new/src/generated/translate_x_timeline.h index 813a4df6a..f6fc1680b 100644 --- a/spine-c-new/src/generated/translate_x_timeline.h +++ b/spine-c-new/src/generated/translate_x_timeline.h @@ -38,4 +38,4 @@ SPINE_C_API spine_rtti spine_translate_x_timeline_rtti(void); } #endif -#endif /* SPINE_SPINE_TRANSLATE_X_TIMELINE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_TRANSLATE_X_TIMELINE_H */ diff --git a/spine-c-new/src/generated/translate_y_timeline.h b/spine-c-new/src/generated/translate_y_timeline.h index fe64caa61..60cd040c3 100644 --- a/spine-c-new/src/generated/translate_y_timeline.h +++ b/spine-c-new/src/generated/translate_y_timeline.h @@ -38,4 +38,4 @@ SPINE_C_API spine_rtti spine_translate_y_timeline_rtti(void); } #endif -#endif /* SPINE_SPINE_TRANSLATE_Y_TIMELINE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_TRANSLATE_Y_TIMELINE_H */ diff --git a/spine-c-new/src/generated/types.h b/spine-c-new/src/generated/types.h index 977f60832..6c0bb8d6e 100644 --- a/spine-c-new/src/generated/types.h +++ b/spine-c-new/src/generated/types.h @@ -187,4 +187,4 @@ SPINE_OPAQUE_TYPE(spine_vertex_attachment) } #endif -#endif // SPINE_C_TYPES_H \ No newline at end of file +#endif // SPINE_C_TYPES_H diff --git a/spine-c-new/src/generated/update.h b/spine-c-new/src/generated/update.h index c33236672..c54c961bb 100644 --- a/spine-c-new/src/generated/update.h +++ b/spine-c-new/src/generated/update.h @@ -18,4 +18,4 @@ SPINE_C_API spine_rtti spine_update_rtti(void); } #endif -#endif /* SPINE_SPINE_UPDATE_H */ \ No newline at end of file +#endif /* SPINE_SPINE_UPDATE_H */ diff --git a/spine-c-new/src/generated/vertex_attachment.h b/spine-c-new/src/generated/vertex_attachment.h index 118749017..fea439e6e 100644 --- a/spine-c-new/src/generated/vertex_attachment.h +++ b/spine-c-new/src/generated/vertex_attachment.h @@ -34,4 +34,4 @@ SPINE_C_API spine_rtti spine_vertex_attachment_rtti(void); } #endif -#endif /* SPINE_SPINE_VERTEX_ATTACHMENT_H */ \ No newline at end of file +#endif /* SPINE_SPINE_VERTEX_ATTACHMENT_H */ diff --git a/spine-c-new/test/test.c b/spine-c-new/test/test.c index f6315b307..9a3e5dfee 100644 --- a/spine-c-new/test/test.c +++ b/spine-c-new/test/test.c @@ -2,15 +2,15 @@ #include #include -int main() { +int main(int argc, char *argv[]) { printf("Testing spine-c-new...\n"); - + // Test version functions printf("Spine version: %d.%d\n", spine_major_version(), spine_minor_version()); - + // Test debug extension spine_enable_debug_extension(1); - + // Test loading an atlas (will fail but tests the API) spine_atlas atlas = spine_atlas_load("test.atlas"); if (!atlas) { @@ -18,9 +18,9 @@ int main() { } else { spine_atlas_dispose(atlas); } - + // Report any memory leaks spine_report_leaks(); - + return 0; -} \ No newline at end of file +} diff --git a/spine-cpp/spine-cpp/include/spine/Debug.h b/spine-cpp/spine-cpp/include/spine/Debug.h index 5487aa563..19fe7c0e6 100644 --- a/spine-cpp/spine-cpp/include/spine/Debug.h +++ b/spine-cpp/spine-cpp/include/spine/Debug.h @@ -32,10 +32,165 @@ #include #include -#include namespace spine { + // Need a copy as HashMap extends SpineObject, which would trigger + // infinite recursion when used in DebugExtension + template + class DebugHashMap { + private: + class DebugEntry; + + public: + class SP_API DebugPair { + public: + explicit DebugPair(K &k, V &v) : key(k), value(v) {} + + K &key; + V &value; + }; + + class SP_API DebugEntries { + public: + friend class DebugHashMap; + + explicit DebugEntries(DebugEntry *entry) : _hasChecked(false) { + _start.next = entry; + _entry = &_start; + } + + DebugPair next() { + assert(_entry); + assert(_hasChecked); + _entry = _entry->next; + DebugPair pair(_entry->_key, _entry->_value); + _hasChecked = false; + return pair; + } + + bool hasNext() { + _hasChecked = true; + return _entry->next; + } + + private: + bool _hasChecked; + DebugEntry _start; + DebugEntry *_entry; + }; + + DebugHashMap() : + _head(NULL), + _size(0) { + } + + ~DebugHashMap() { + clear(); + } + + void clear() { + for (DebugEntry *entry = _head; entry != NULL;) { + DebugEntry *next = entry->next; + delete entry; + entry = next; + } + _head = NULL; + _size = 0; + } + + size_t size() { + return _size; + } + + void put(const K &key, const V &value) { + DebugEntry *entry = find(key); + if (entry) { + entry->_key = key; + entry->_value = value; + } else { + entry = new DebugEntry(); + entry->_key = key; + entry->_value = value; + + DebugEntry *oldHead = _head; + + if (oldHead) { + _head = entry; + oldHead->prev = entry; + entry->next = oldHead; + } else { + _head = entry; + } + _size++; + } + } + + bool addAll(Array &keys, const V &value) { + size_t oldSize = _size; + for (size_t i = 0; i < keys.size(); i++) { + put(keys[i], value); + } + return _size != oldSize; + } + + bool containsKey(const K &key) { + return find(key) != NULL; + } + + bool remove(const K &key) { + DebugEntry *entry = find(key); + if (!entry) return false; + + DebugEntry *prev = entry->prev; + DebugEntry *next = entry->next; + + if (prev) prev->next = next; + else _head = next; + if (next) next->prev = entry->prev; + + delete entry; + _size--; + + return true; + } + + V operator[](const K &key) { + DebugEntry *entry = find(key); + if (entry) return entry->_value; + else { + assert(false); + return 0; + } + } + + DebugEntries getEntries() const { + return DebugEntries(_head); + } + + private: + DebugEntry *find(const K &key) { + for (DebugEntry *entry = _head; entry != NULL; entry = entry->next) { + if (entry->_key == key) + return entry; + } + return NULL; + } + + class SP_API DebugEntry { + public: + K _key; + V _value; + DebugEntry *next; + DebugEntry *prev; + + DebugEntry() : next(NULL), prev(NULL) {} + }; + + DebugEntry *_head; + size_t _size; + }; + class SP_API DebugExtension : public SpineExtension { struct Allocation { void *address; @@ -56,9 +211,9 @@ namespace spine { } void reportLeaks() { - HashMap::Entries entries = _allocated.getEntries(); + DebugHashMap::DebugEntries entries = _allocated.getEntries(); while (entries.hasNext()) { - HashMap::Pair pair = entries.next(); + DebugHashMap::DebugPair pair = entries.next(); printf("\"%s:%i (%zu bytes at %p)\n", pair.value.fileName, pair.value.line, pair.value.size, pair.value.address); } @@ -90,9 +245,9 @@ namespace spine { virtual void *_realloc(void *ptr, size_t size, const char *file, int line) { if (_allocated.containsKey(ptr)) { // Find and store the size before removing - HashMap::Entries entries = _allocated.getEntries(); + DebugHashMap::DebugEntries entries = _allocated.getEntries(); while (entries.hasNext()) { - HashMap::Pair pair = entries.next(); + DebugHashMap::DebugPair pair = entries.next(); if (pair.key == ptr) { _usedMemory -= pair.value.size; break; @@ -112,9 +267,9 @@ namespace spine { _extension->_free(mem, file, line); _frees++; // Find and store the size before removing - HashMap::Entries entries = _allocated.getEntries(); + DebugHashMap::DebugEntries entries = _allocated.getEntries(); while (entries.hasNext()) { - HashMap::Pair pair = entries.next(); + DebugHashMap::DebugPair pair = entries.next(); if (pair.key == mem) { _usedMemory -= pair.value.size; break; @@ -146,7 +301,7 @@ namespace spine { private: SpineExtension *_extension; - HashMap _allocated; + DebugHashMap _allocated; size_t _allocations; size_t _reallocations; size_t _frees; diff --git a/spine-cpp/spine-cpp/include/spine/HashMap.h b/spine-cpp/spine-cpp/include/spine/HashMap.h index f354a6d43..d3533dff6 100755 --- a/spine-cpp/spine-cpp/include/spine/HashMap.h +++ b/spine-cpp/spine-cpp/include/spine/HashMap.h @@ -60,7 +60,7 @@ namespace spine { public: friend class HashMap; - explicit Entries(Entry *entry) : _entry(NULL), _hasChecked(false) { + explicit Entries(Entry *entry) : _hasChecked(false) { _start.next = entry; _entry = &_start; }