diff --git a/build.gradle b/build.gradle deleted file mode 100644 index 9b5def8f1..000000000 --- a/build.gradle +++ /dev/null @@ -1,23 +0,0 @@ -buildscript { repositories { mavenCentral() }} - -plugins { - id "com.diffplug.spotless" version "5.14.0" -} - -spotless { - lineEndings 'UNIX' - - java { - target 'spine-libgdx/**/*.java' - eclipse().configFile('formatters/eclipse-formatter.xml') - } - - cpp { - target 'spine-c/**/*.c', 'spine-c/**/.h', - 'spine-cpp/**/*.cpp', 'spine-cpp/**/.h', - 'spine-cocos2dx/src/**/*.cpp', 'spine-cocos2dx/src/**/*.h', 'spine-cocos2dx/example/Classes/**/*.cpp', 'spine-cocos2dx/example/Classes/**/*.h', - 'spine-sfml/**/*.c', 'spine-sfml/**/*.cpp', 'spine-sfml/**/*.h', - 'spine-ue4/**/*.cpp', 'spine-ue4/**/*.h' - clangFormat('12.0.0').style('file') - } -} \ No newline at end of file diff --git a/.clang-format b/formatters/.clang-format similarity index 100% rename from .clang-format rename to formatters/.clang-format diff --git a/formatters/README.md b/formatters/README.md index e69de29bb..109f3b85d 100644 --- a/formatters/README.md +++ b/formatters/README.md @@ -0,0 +1,9 @@ +# Formatters +This folder contains formatter configuration files to be used with IDEs as well as the [spotless](https://github.com/diffplug/spotless/blob/main/plugin-gradle/README.md) formatter expressed in the Gradle project in this directory. + +You will need the following in your `PATH`: + +- JDK 10+ +- clang-format 12 (i.e. `brew install clang-format`) + +To run the formatter, invoke the `format.sh` script. This will shuffle around the Gradle config files, invoke spotless, then undo the config file shuffling. Invoking `./gradlew spotlessApply` from the `formatters/` directory will not work. \ No newline at end of file diff --git a/formatters/build.gradle b/formatters/build.gradle new file mode 100644 index 000000000..7b2c6a7e4 --- /dev/null +++ b/formatters/build.gradle @@ -0,0 +1,31 @@ +buildscript { repositories { mavenCentral() }} + +plugins { + id "com.diffplug.spotless" version "5.14.0" +} + +spotless { + lineEndings 'UNIX' + + java { + target 'spine-libgdx/**/*.java' + eclipse().configFile('formatters/eclipse-formatter.xml') + } + + cpp { + target 'spine-c/**/*.c', + 'spine-c/**/.h', + 'spine-cpp/**/*.cpp', + 'spine-cpp/**/.h', + 'spine-cocos2dx/src/**/*.cpp', + 'spine-cocos2dx/src/**/*.h', + 'spine-cocos2dx/example/Classes/**/*.cpp', + 'spine-cocos2dx/example/Classes/**/*.h', + 'spine-sfml/**/*.c', + 'spine-sfml/**/*.cpp', + 'spine-sfml/**/*.h', + 'spine-ue4/**/*.cpp', + 'spine-ue4/**/*.h' + clangFormat('12.0.1').style('file') + } +} \ No newline at end of file diff --git a/formatters/editorconfig b/formatters/editorconfig new file mode 100644 index 000000000..d92f4a08b --- /dev/null +++ b/formatters/editorconfig @@ -0,0 +1,201 @@ +# Remove the line below if you want to inherit .editorconfig settings from higher directories +root = true + +# C# files +[*.cs] + +#### Core EditorConfig Options #### + +# Indentation and spacing +indent_size = 4 +indent_style = tab +tab_width = 4 + +# New line preferences +end_of_line = crlf +insert_final_newline = false + +#### .NET Coding Conventions #### + +# Organize usings +dotnet_separate_import_directive_groups = false +dotnet_sort_system_directives_first = false +file_header_template = unset + +# this. and Me. preferences +dotnet_style_qualification_for_event = false:silent +dotnet_style_qualification_for_field = false:silent +dotnet_style_qualification_for_method = false:silent +dotnet_style_qualification_for_property = false:silent + +# Language keywords vs BCL types preferences +dotnet_style_predefined_type_for_locals_parameters_members = true:silent +dotnet_style_predefined_type_for_member_access = true:silent + +# Parentheses preferences +dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent +dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent +dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent +dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent + +# Modifier preferences +dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent + +# Expression-level preferences +dotnet_style_coalesce_expression = true:suggestion +dotnet_style_collection_initializer = true:suggestion +dotnet_style_explicit_tuple_names = true:suggestion +dotnet_style_null_propagation = true:suggestion +dotnet_style_object_initializer = true:suggestion +dotnet_style_operator_placement_when_wrapping = beginning_of_line +dotnet_style_prefer_auto_properties = true:silent +dotnet_style_prefer_compound_assignment = true:suggestion +dotnet_style_prefer_conditional_expression_over_assignment = true:silent +dotnet_style_prefer_conditional_expression_over_return = true:silent +dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion +dotnet_style_prefer_inferred_tuple_names = true:suggestion +dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion +dotnet_style_prefer_simplified_boolean_expressions = true:suggestion +dotnet_style_prefer_simplified_interpolation = true:suggestion + +# Field preferences +dotnet_style_readonly_field = true:suggestion + +# Parameter preferences +dotnet_code_quality_unused_parameters = all:suggestion + +#### C# Coding Conventions #### + +# var preferences +csharp_style_var_elsewhere = false:silent +csharp_style_var_for_built_in_types = false:silent +csharp_style_var_when_type_is_apparent = false:silent + +# Expression-bodied members +csharp_style_expression_bodied_accessors = true:silent +csharp_style_expression_bodied_constructors = false:silent +csharp_style_expression_bodied_indexers = true:silent +csharp_style_expression_bodied_lambdas = true:silent +csharp_style_expression_bodied_local_functions = false:silent +csharp_style_expression_bodied_methods = false:silent +csharp_style_expression_bodied_operators = false:silent +csharp_style_expression_bodied_properties = true:silent + +# Pattern matching preferences +csharp_style_pattern_matching_over_as_with_null_check = true:suggestion +csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion +csharp_style_prefer_switch_expression = true:suggestion + +# Null-checking preferences +csharp_style_conditional_delegate_call = true:suggestion + +# Modifier preferences +csharp_prefer_static_local_function = true:suggestion +csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:silent + +# Code-block preferences +csharp_prefer_braces = true:silent +csharp_prefer_simple_using_statement = true:suggestion + +# Expression-level preferences +csharp_prefer_simple_default_expression = true:suggestion +csharp_style_deconstructed_variable_declaration = true:suggestion +csharp_style_inlined_variable_declaration = true:suggestion +csharp_style_pattern_local_over_anonymous_function = true:suggestion +csharp_style_prefer_index_operator = true:suggestion +csharp_style_prefer_range_operator = true:suggestion +csharp_style_throw_expression = true:suggestion +csharp_style_unused_value_assignment_preference = discard_variable:suggestion +csharp_style_unused_value_expression_statement_preference = discard_variable:silent + +# 'using' directive preferences +csharp_using_directive_placement = outside_namespace:silent + +#### C# Formatting Rules #### + +# New line preferences +csharp_new_line_before_catch = true +csharp_new_line_before_else = false +csharp_new_line_before_finally = true +csharp_new_line_before_members_in_anonymous_types = true +csharp_new_line_before_members_in_object_initializers = true +csharp_new_line_before_open_brace = none +csharp_new_line_between_query_expression_clauses = true + +# Indentation preferences +csharp_indent_block_contents = true +csharp_indent_braces = false +csharp_indent_case_contents = true +csharp_indent_case_contents_when_block = false +csharp_indent_labels = one_less_than_current +csharp_indent_switch_labels = false + +# Space preferences +csharp_space_after_cast = false +csharp_space_after_colon_in_inheritance_clause = true +csharp_space_after_comma = true +csharp_space_after_dot = false +csharp_space_after_keywords_in_control_flow_statements = true +csharp_space_after_semicolon_in_for_statement = true +csharp_space_around_binary_operators = before_and_after +csharp_space_around_declaration_statements = false +csharp_space_before_colon_in_inheritance_clause = true +csharp_space_before_comma = false +csharp_space_before_dot = false +csharp_space_before_open_square_brackets = false +csharp_space_before_semicolon_in_for_statement = false +csharp_space_between_empty_square_brackets = false +csharp_space_between_method_call_empty_parameter_list_parentheses = false +csharp_space_between_method_call_name_and_opening_parenthesis = false +csharp_space_between_method_call_parameter_list_parentheses = false +csharp_space_between_method_declaration_empty_parameter_list_parentheses = false +csharp_space_between_method_declaration_name_and_open_parenthesis = true +csharp_space_between_method_declaration_parameter_list_parentheses = false +csharp_space_between_parentheses = false +csharp_space_between_square_brackets = false + +# Wrapping preferences +csharp_preserve_single_line_blocks = true +csharp_preserve_single_line_statements = true + +#### Naming styles #### + +# Naming rules + +dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion +dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface +dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i + +dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion +dotnet_naming_rule.types_should_be_pascal_case.symbols = types +dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case + +dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion +dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members +dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case + +# Symbol specifications + +dotnet_naming_symbols.interface.applicable_kinds = interface +dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.interface.required_modifiers = + +dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum +dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.types.required_modifiers = + +dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method +dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.non_field_members.required_modifiers = + +# Naming styles + +dotnet_naming_style.pascal_case.required_prefix = +dotnet_naming_style.pascal_case.required_suffix = +dotnet_naming_style.pascal_case.word_separator = +dotnet_naming_style.pascal_case.capitalization = pascal_case + +dotnet_naming_style.begins_with_i.required_prefix = I +dotnet_naming_style.begins_with_i.required_suffix = +dotnet_naming_style.begins_with_i.word_separator = +dotnet_naming_style.begins_with_i.capitalization = pascal_case diff --git a/formatters/format.sh b/formatters/format.sh new file mode 100755 index 000000000..75892a425 --- /dev/null +++ b/formatters/format.sh @@ -0,0 +1,28 @@ +#!/bin/bash +set -e +dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )" + +trap "cleanup" ERR + +setup() { + cp $dir/.clang-format $dir/.. + cp $dir/build.gradle $dir/.. + cp $dir/settings.gradle $dir/.. +} + +cleanup() { + rm $dir/../.clang-format + rm $dir/../build.gradle + rm $dir/../settings.gradle +} + +# copy Gradle and clang-format config to root +setup + +# Execute spotless +pushd $dir/.. +./formatters/gradlew spotlessApply +popd + +# Delete Gradle and clang-format config files in root +cleanup \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/formatters/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from gradle/wrapper/gradle-wrapper.jar rename to formatters/gradle/wrapper/gradle-wrapper.jar diff --git a/gradle/wrapper/gradle-wrapper.properties b/formatters/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from gradle/wrapper/gradle-wrapper.properties rename to formatters/gradle/wrapper/gradle-wrapper.properties diff --git a/gradlew b/formatters/gradlew similarity index 100% rename from gradlew rename to formatters/gradlew diff --git a/gradlew.bat b/formatters/gradlew.bat similarity index 100% rename from gradlew.bat rename to formatters/gradlew.bat diff --git a/settings.gradle b/formatters/settings.gradle similarity index 100% rename from settings.gradle rename to formatters/settings.gradle diff --git a/spine-c/spine-c/src/spine/Animation.c b/spine-c/spine-c/src/spine/Animation.c index a60f6e22c..dff7201b4 100644 --- a/spine-c/spine-c/src/spine/Animation.c +++ b/spine-c/spine-c/src/spine/Animation.c @@ -86,8 +86,8 @@ void spAnimation_apply(const spAnimation *self, spSkeleton *skeleton, float last } static int search(spFloatArray - *values, - float time) { + *values, + float time) { int i, n; float *items = values->items; for ( @@ -99,9 +99,9 @@ static int search(spFloatArray } static int search2(spFloatArray - *values, - float time, - int step) { + *values, + float time, + int step) { int i, n; float *items = values->items; for (