diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 5a2cf4639..6b4a72e4b 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -112,39 +112,68 @@ org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 +org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=false org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=0 +org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false +org.eclipse.jdt.core.formatter.align_with_spaces=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=48 +org.eclipse.jdt.core.formatter.alignment_for_annotations_on_enum_constant=49 +org.eclipse.jdt.core.formatter.alignment_for_annotations_on_field=49 +org.eclipse.jdt.core.formatter.alignment_for_annotations_on_local_variable=49 +org.eclipse.jdt.core.formatter.alignment_for_annotations_on_method=49 +org.eclipse.jdt.core.formatter.alignment_for_annotations_on_package=49 +org.eclipse.jdt.core.formatter.alignment_for_annotations_on_parameter=0 +org.eclipse.jdt.core.formatter.alignment_for_annotations_on_type=49 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=48 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=48 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=0 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=48 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=48 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=48 +org.eclipse.jdt.core.formatter.alignment_for_assertion_message=48 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 org.eclipse.jdt.core.formatter.alignment_for_binary_expression=0 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=0 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=0 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=48 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=48 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_loops=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=48 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=16 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=16 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_arrow=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_colon=0 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=48 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_module_statements=16 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=48 org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=0 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=48 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=48 +org.eclipse.jdt.core.formatter.alignment_for_record_components=16 +org.eclipse.jdt.core.formatter.alignment_for_relational_operator=48 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=0 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=48 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=0 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=48 +org.eclipse.jdt.core.formatter.alignment_for_shift_operator=48 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=48 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_record_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_switch_case_with_arrow=0 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_type_annotations=0 org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0 org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0 org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=2 +org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration=0 org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_abstract_method=1 org.eclipse.jdt.core.formatter.blank_lines_before_field=0 org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 @@ -153,7 +182,8 @@ org.eclipse.jdt.core.formatter.blank_lines_before_method=1 org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 org.eclipse.jdt.core.formatter.blank_lines_before_package=0 org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.blank_lines_between_statement_group_in_switch=0 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=2 org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line @@ -164,43 +194,50 @@ org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_record_constructor=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_record_declaration=end_of_line org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=false +org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=false -org.eclipse.jdt.core.formatter.comment.format_block_comments=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true org.eclipse.jdt.core.formatter.comment.format_header=false org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false -org.eclipse.jdt.core.formatter.comment.format_line_comments=false +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false +org.eclipse.jdt.core.formatter.comment.indent_root_tags=false +org.eclipse.jdt.core.formatter.comment.indent_tag_description=false org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert org.eclipse.jdt.core.formatter.comment.line_length=80 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.continuation_indentation=1 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1 org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true +org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_record_header=true org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true +org.eclipse.jdt.core.formatter.indentation.size=8 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert @@ -211,7 +248,7 @@ org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert @@ -224,12 +261,16 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=do not ins org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert @@ -254,15 +295,21 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arg org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_permitted_types=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_record_components=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_not_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert @@ -275,6 +322,7 @@ org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not ins org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_record_declaration=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert @@ -283,17 +331,24 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case=insert +org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert @@ -306,6 +361,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not in org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_record_declaration=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert @@ -332,22 +388,29 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_ar org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_permitted_types=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_record_components=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_constructor=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_declaration=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert @@ -355,27 +418,31 @@ org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_refe org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_record_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -387,33 +454,67 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_decla org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert org.eclipse.jdt.core.formatter.join_lines_in_comments=true org.eclipse.jdt.core.formatter.join_wrapped_lines=false +org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_if_empty +org.eclipse.jdt.core.formatter.keep_code_block_on_one_line=one_line_if_empty org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line=one_line_if_empty +org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line=one_line_if_empty org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false +org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line=one_line_if_empty +org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line=one_line_if_empty +org.eclipse.jdt.core.formatter.keep_method_body_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_record_constructor_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_record_declaration_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false +org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false +org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false +org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false +org.eclipse.jdt.core.formatter.keep_switch_body_block_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_switch_case_with_arrow_on_one_line=one_line_never org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.lineSplit=200 +org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.lineSplit=100 org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_after_code_block=0 +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_code_block=0 org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_code_block=0 +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_blank_lines_before_code_block=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=2 +org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=separate_lines_if_wrapped +org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=separate_lines_if_wrapped +org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=separate_lines_if_wrapped +org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=separate_lines_if_wrapped +org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=separate_lines_if_wrapped +org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=separate_lines_if_wrapped +org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=separate_lines_if_wrapped +org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=separate_lines_if_wrapped +org.eclipse.jdt.core.formatter.parentheses_positions_in_record_declaration=separate_lines_if_wrapped +org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=separate_lines_if_wrapped +org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=separate_lines_if_wrapped org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true org.eclipse.jdt.core.formatter.tabulation.char=tab org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.text_block_indentation=0 org.eclipse.jdt.core.formatter.use_on_off_tags=true org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_assertion_message_operator=true org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true +org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true +org.eclipse.jdt.core.formatter.wrap_before_switch_case_arrow_operator=false org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter diff --git a/slime-java-commons b/slime-java-commons index 94acd0dfa..7743389eb 160000 --- a/slime-java-commons +++ b/slime-java-commons @@ -1 +1 @@ -Subproject commit 94acd0dfaee0dca5ad51811c8f3bcf8facc964f2 +Subproject commit 7743389eb53e5bb91475376d771016bf800e81c1 diff --git a/src/main/java/dev/slimevr/Main.java b/src/main/java/dev/slimevr/Main.java index 9e91fbd01..735fc64db 100644 --- a/src/main/java/dev/slimevr/Main.java +++ b/src/main/java/dev/slimevr/Main.java @@ -12,6 +12,7 @@ import java.io.File; import java.io.IOException; import java.net.ServerSocket; + public class Main { public static String VERSION = "0.1.6"; @@ -29,7 +30,12 @@ public class Main { Options options = new Options(); - Option noGui = new Option("g", "no-gui", false, "disable swing gui (allow for other gui to be used)"); + Option noGui = new Option( + "g", + "no-gui", + false, + "disable swing gui (allow for other gui to be used)" + ); Option help = new Option("h", "help", false, "Show help"); options.addOption(noGui); @@ -55,8 +61,14 @@ public class Main { } if (!SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_11)) { - LogManager.log.severe("SlimeVR start-up error! A minimum of Java 11 is required."); - JOptionPane.showMessageDialog(null, "SlimeVR start-up error! A minimum of Java 11 is required.", "SlimeVR: Java Runtime Mismatch", JOptionPane.ERROR_MESSAGE); + LogManager.severe("SlimeVR start-up error! A minimum of Java 11 is required."); + JOptionPane + .showMessageDialog( + null, + "SlimeVR start-up error! A minimum of Java 11 is required.", + "SlimeVR: Java Runtime Mismatch", + JOptionPane.ERROR_MESSAGE + ); return; } @@ -65,8 +77,17 @@ public class Main { new ServerSocket(35903).close(); new ServerSocket(21110).close(); } catch (IOException e) { - LogManager.log.severe("SlimeVR start-up error! Required ports are busy. Make sure there is no other instance of SlimeVR Server running."); - JOptionPane.showMessageDialog(null, "SlimeVR start-up error! Required ports are busy. Make sure there is no other instance of SlimeVR Server running.", "SlimeVR: Ports are busy", JOptionPane.ERROR_MESSAGE); + LogManager + .severe( + "SlimeVR start-up error! Required ports are busy. Make sure there is no other instance of SlimeVR Server running." + ); + JOptionPane + .showMessageDialog( + null, + "SlimeVR start-up error! Required ports are busy. Make sure there is no other instance of SlimeVR Server running.", + "SlimeVR: Ports are busy", + JOptionPane.ERROR_MESSAGE + ); return; } @@ -83,7 +104,9 @@ public class Main { } catch (InterruptedException e2) { e.printStackTrace(); } - System.exit(1); // Exit in case error happened on init and window not appeared, but some thread started + System.exit(1); // Exit in case error happened on init and window + // not appeared, but some thread + // started } finally { try { Thread.sleep(2000L); diff --git a/src/main/java/dev/slimevr/VRServer.java b/src/main/java/dev/slimevr/VRServer.java index b6ca15eaf..993073a34 100644 --- a/src/main/java/dev/slimevr/VRServer.java +++ b/src/main/java/dev/slimevr/VRServer.java @@ -28,6 +28,7 @@ import java.util.*; import java.util.concurrent.LinkedBlockingQueue; import java.util.function.Consumer; + public class VRServer extends Thread { public final HumanPoseProcessor humanPoseProcessor; @@ -59,7 +60,8 @@ public class VRServer extends Thread { protocolAPI = new ProtocolAPI(this); hmdTracker = new HMDTracker("HMD"); - hmdTracker.position.set(0, 1.8f, 0); // Set starting position for easier debugging + hmdTracker.position.set(0, 1.8f, 0); // Set starting position for easier + // debugging // TODO Multiple processors humanPoseProcessor = new HumanPoseProcessor(this, hmdTracker); shareTrackers = humanPoseProcessor.getComputedTrackers(); @@ -71,13 +73,25 @@ public class VRServer extends Thread { if (OperatingSystem.getCurrentPlatform() == OperatingSystem.WINDOWS) { // Create named pipe bridge for SteamVR driver - WindowsNamedPipeBridge driverBridge = new WindowsNamedPipeBridge(hmdTracker, "steamvr", "SteamVR Driver Bridge", "\\\\.\\pipe\\SlimeVRDriver", shareTrackers); + WindowsNamedPipeBridge driverBridge = new WindowsNamedPipeBridge( + hmdTracker, + "steamvr", + "SteamVR Driver Bridge", + "\\\\.\\pipe\\SlimeVRDriver", + shareTrackers + ); tasks.add(() -> driverBridge.startBridge()); bridges.add(driverBridge); // Create named pipe bridge for SteamVR input // TODO: how do we want to handle HMD input from the feeder app? - WindowsNamedPipeBridge feederBridge = new WindowsNamedPipeBridge(null, "steamvr_feeder", "SteamVR Feeder Bridge", "\\\\.\\pipe\\SlimeVRInput", new FastList()); + WindowsNamedPipeBridge feederBridge = new WindowsNamedPipeBridge( + null, + "steamvr_feeder", + "SteamVR Feeder Bridge", + "\\\\.\\pipe\\SlimeVRInput", + new FastList() + ); tasks.add(() -> feederBridge.startBridge()); bridges.add(feederBridge); } @@ -245,8 +259,7 @@ public class VRServer extends Thread { // final long time = System.currentTimeMillis() - start; try { Thread.sleep(1); // 1000Hz - } catch (InterruptedException e) { - } + } catch (InterruptedException e) {} } } @@ -322,8 +335,13 @@ public class VRServer extends Thread { return tracker; } - if (tracker.getDevice() != null && id.getDeviceId() != null && id.getDeviceId().getId() == tracker.getDevice().getId()) { - // This is a physical tracker, and both device id and the tracker num match + if ( + tracker.getDevice() != null + && id.getDeviceId() != null + && id.getDeviceId().getId() == tracker.getDevice().getId() + ) { + // This is a physical tracker, and both device id and the + // tracker num match return tracker; } } diff --git a/src/main/java/dev/slimevr/autobone/AutoBone.java b/src/main/java/dev/slimevr/autobone/AutoBone.java index 8a5d50f0d..9ca7e08d2 100644 --- a/src/main/java/dev/slimevr/autobone/AutoBone.java +++ b/src/main/java/dev/slimevr/autobone/AutoBone.java @@ -23,17 +23,27 @@ import java.util.Map; import java.util.Map.Entry; import java.util.function.Consumer; + public class AutoBone { private static final File saveDir = new File("Recordings"); private static final File loadDir = new File("LoadRecordings"); // This is filled by reloadConfigValues() - public final EnumMap configs = new EnumMap(SkeletonConfigValue.class); - public final EnumMap staticConfigs = new EnumMap(SkeletonConfigValue.class); - public final FastList heightConfigs = new FastList(new SkeletonConfigValue[]{ - SkeletonConfigValue.NECK, SkeletonConfigValue.TORSO, SkeletonConfigValue.LEGS_LENGTH}); - public final FastList lengthConfigs = new FastList(new SkeletonConfigValue[]{ - SkeletonConfigValue.HEAD, SkeletonConfigValue.NECK, SkeletonConfigValue.TORSO, SkeletonConfigValue.HIPS_WIDTH, SkeletonConfigValue.LEGS_LENGTH}); + public final EnumMap configs = new EnumMap( + SkeletonConfigValue.class + ); + public final EnumMap staticConfigs = new EnumMap( + SkeletonConfigValue.class + ); + public final FastList heightConfigs = new FastList( + new SkeletonConfigValue[] { SkeletonConfigValue.NECK, SkeletonConfigValue.TORSO, + SkeletonConfigValue.LEGS_LENGTH } + ); + public final FastList lengthConfigs = new FastList( + new SkeletonConfigValue[] { SkeletonConfigValue.HEAD, SkeletonConfigValue.NECK, + SkeletonConfigValue.TORSO, SkeletonConfigValue.HIPS_WIDTH, + SkeletonConfigValue.LEGS_LENGTH } + ); protected final VRServer server; public int cursorIncrement = 1; public int minDataDistance = 2; @@ -47,43 +57,63 @@ public class AutoBone { public float proportionErrorFactor = 0.2f; public float heightErrorFactor = 0.1f; - // TODO Needs much more work, probably going to rethink how the errors work to avoid this barely functional workaround @ButterscotchV + // TODO Needs much more work, probably going to rethink how the errors work + // to + // avoid this barely functional workaround @ButterscotchV // For scaling distances, since smaller sizes will cause smaller distances - //private float totalLengthBase = 2f; + // private float totalLengthBase = 2f; public float positionErrorFactor = 0.0f; public float positionOffsetErrorFactor = 0.0f; public boolean calcInitError = false; public float targetHeight = -1; - // TODO hip tracker stuff... Hip tracker should be around 3 to 5 centimeters. + // TODO hip tracker stuff... Hip tracker should be around 3 to 5 + // centimeters. // Human average is probably 1.1235 (SD 0.07) public float legBodyRatio = 1.1235f; // SD of 0.07, capture 68% within range public float legBodyRatioRange = 0.07f; - // kneeLegRatio seems to be around 0.54 to 0.6 after asking a few people in the SlimeVR discord. + // kneeLegRatio seems to be around 0.54 to 0.6 after asking a few people in + // the + // SlimeVR discord. public float kneeLegRatio = 0.55f; - // kneeLegRatio seems to be around 0.55 to 0.64 after asking a few people in the SlimeVR discord. TODO : Chest should be a bit shorter (0.54?) if user has an additional hip tracker. + // kneeLegRatio seems to be around 0.55 to 0.64 after asking a few people in + // the + // SlimeVR discord. TODO : Chest should be a bit shorter (0.54?) if user has + // an + // additional hip tracker. public float chestTorsoRatio = 0.57f; public AutoBone(VRServer server) { this.server = server; reloadConfigValues(); - this.minDataDistance = server.config.getInt("autobone.minimumDataDistance", this.minDataDistance); - this.maxDataDistance = server.config.getInt("autobone.maximumDataDistance", this.maxDataDistance); + this.minDataDistance = server.config + .getInt("autobone.minimumDataDistance", this.minDataDistance); + this.maxDataDistance = server.config + .getInt("autobone.maximumDataDistance", this.maxDataDistance); this.numEpochs = server.config.getInt("autobone.epochCount", this.numEpochs); - this.initialAdjustRate = server.config.getFloat("autobone.adjustRate", this.initialAdjustRate); - this.adjustRateDecay = server.config.getFloat("autobone.adjustRateDecay", this.adjustRateDecay); + this.initialAdjustRate = server.config + .getFloat("autobone.adjustRate", this.initialAdjustRate); + this.adjustRateDecay = server.config + .getFloat("autobone.adjustRateDecay", this.adjustRateDecay); - this.slideErrorFactor = server.config.getFloat("autobone.slideErrorFactor", this.slideErrorFactor); - this.offsetSlideErrorFactor = server.config.getFloat("autobone.offsetSlideErrorFactor", this.offsetSlideErrorFactor); - this.offsetErrorFactor = server.config.getFloat("autobone.offsetErrorFactor", this.offsetErrorFactor); - this.proportionErrorFactor = server.config.getFloat("autobone.proportionErrorFactor", this.proportionErrorFactor); - this.heightErrorFactor = server.config.getFloat("autobone.heightErrorFactor", this.heightErrorFactor); - this.positionErrorFactor = server.config.getFloat("autobone.positionErrorFactor", this.positionErrorFactor); - this.positionOffsetErrorFactor = server.config.getFloat("autobone.positionOffsetErrorFactor", this.positionOffsetErrorFactor); + this.slideErrorFactor = server.config + .getFloat("autobone.slideErrorFactor", this.slideErrorFactor); + this.offsetSlideErrorFactor = server.config + .getFloat("autobone.offsetSlideErrorFactor", this.offsetSlideErrorFactor); + this.offsetErrorFactor = server.config + .getFloat("autobone.offsetErrorFactor", this.offsetErrorFactor); + this.proportionErrorFactor = server.config + .getFloat("autobone.proportionErrorFactor", this.proportionErrorFactor); + this.heightErrorFactor = server.config + .getFloat("autobone.heightErrorFactor", this.heightErrorFactor); + this.positionErrorFactor = server.config + .getFloat("autobone.positionErrorFactor", this.positionErrorFactor); + this.positionOffsetErrorFactor = server.config + .getFloat("autobone.positionOffsetErrorFactor", this.positionOffsetErrorFactor); this.calcInitError = server.config.getBoolean("autobone.calculateInitialError", true); this.targetHeight = server.config.getFloat("autobone.manualTargetHeight", -1f); @@ -111,7 +141,12 @@ public class AutoBone { staticConfigs.put(SkeletonConfigValue.HEAD, readFromConfig(SkeletonConfigValue.HEAD)); staticConfigs.put(SkeletonConfigValue.NECK, readFromConfig(SkeletonConfigValue.NECK)); configs.put(SkeletonConfigValue.TORSO, readFromConfig(SkeletonConfigValue.TORSO)); - if (server.config.getBoolean("autobone.forceChestTracker", false) || (trackers != null && TrackerUtils.findTrackerForBodyPosition(trackers, TrackerPosition.CHEST) != null)) { + if ( + server.config.getBoolean("autobone.forceChestTracker", false) + || (trackers != null + && TrackerUtils.findTrackerForBodyPosition(trackers, TrackerPosition.CHEST) + != null) + ) { // If force enabled or has a chest tracker staticConfigs.remove(SkeletonConfigValue.CHEST); configs.put(SkeletonConfigValue.CHEST, readFromConfig(SkeletonConfigValue.CHEST)); @@ -120,7 +155,14 @@ public class AutoBone { configs.remove(SkeletonConfigValue.CHEST); staticConfigs.put(SkeletonConfigValue.CHEST, readFromConfig(SkeletonConfigValue.CHEST)); } - if (server.config.getBoolean("autobone.forceHipTracker", false) || (trackers != null && TrackerUtils.findTrackerForBodyPosition(trackers, TrackerPosition.HIP) != null && TrackerUtils.findTrackerForBodyPosition(trackers, TrackerPosition.WAIST) != null)) { + if ( + server.config.getBoolean("autobone.forceHipTracker", false) + || (trackers != null + && TrackerUtils.findTrackerForBodyPosition(trackers, TrackerPosition.HIP) + != null + && TrackerUtils.findTrackerForBodyPosition(trackers, TrackerPosition.WAIST) + != null) + ) { // If force enabled or has a hip tracker and waist tracker staticConfigs.remove(SkeletonConfigValue.WAIST); configs.put(SkeletonConfigValue.WAIST, readFromConfig(SkeletonConfigValue.WAIST)); @@ -131,9 +173,12 @@ public class AutoBone { } // Load leg configs - staticConfigs.put(SkeletonConfigValue.HIPS_WIDTH, readFromConfig(SkeletonConfigValue.HIPS_WIDTH)); - configs.put(SkeletonConfigValue.LEGS_LENGTH, readFromConfig(SkeletonConfigValue.LEGS_LENGTH)); - configs.put(SkeletonConfigValue.KNEE_HEIGHT, readFromConfig(SkeletonConfigValue.KNEE_HEIGHT)); + staticConfigs + .put(SkeletonConfigValue.HIPS_WIDTH, readFromConfig(SkeletonConfigValue.HIPS_WIDTH)); + configs + .put(SkeletonConfigValue.LEGS_LENGTH, readFromConfig(SkeletonConfigValue.LEGS_LENGTH)); + configs + .put(SkeletonConfigValue.KNEE_HEIGHT, readFromConfig(SkeletonConfigValue.KNEE_HEIGHT)); // Keep "feet" at ankles staticConfigs.put(SkeletonConfigValue.FOOT_LENGTH, 0f); @@ -142,9 +187,11 @@ public class AutoBone { } /** - * A simple utility method to get the {@link HumanSkeleton} from the {@link VRServer} + * A simple utility method to get the {@link HumanSkeleton} from the + * {@link VRServer} * - * @return The {@link HumanSkeleton} associated with the {@link VRServer}, or null if there is none available + * @return The {@link HumanSkeleton} associated with the {@link VRServer}, + * or null if there is none available * @see {@link VRServer}, {@link HumanSkeleton} */ private HumanSkeleton getSkeleton() { @@ -169,7 +216,7 @@ public class AutoBone { skeletonConfig.saveToConfig(server.config); server.saveConfig(); - LogManager.log.info("[AutoBone] Configured skeleton bone lengths"); + LogManager.info("[AutoBone] Configured skeleton bone lengths"); return true; } @@ -180,7 +227,8 @@ public class AutoBone { } } - // This doesn't require a skeleton, therefore can be used if skeleton is null + // This doesn't require a skeleton, therefore can be used if skeleton is + // null public void saveConfigs() { for (SkeletonConfigValue config : SkeletonConfigValue.values) { setConfig(config); @@ -194,7 +242,11 @@ public class AutoBone { return configVal != null ? configVal : staticConfigs.get(config); } - public Float getConfig(SkeletonConfigValue config, Map configs, Map configsAlt) { + public Float getConfig( + SkeletonConfigValue config, + Map configs, + Map configsAlt + ) { if (configs == null) { throw new NullPointerException("Argument \"configs\" must not be null"); } @@ -203,7 +255,11 @@ public class AutoBone { return configVal != null || configsAlt == null ? configVal : configsAlt.get(config); } - public float sumSelectConfigs(List selection, Map configs, Map configsAlt) { + public float sumSelectConfigs( + List selection, + Map configs, + Map configsAlt + ) { float sum = 0f; for (SkeletonConfigValue config : selection) { @@ -216,7 +272,10 @@ public class AutoBone { return sum; } - public float sumSelectConfigs(List selection, SkeletonConfig skeletonConfig) { + public float sumSelectConfigs( + List selection, + SkeletonConfig skeletonConfig + ) { float sum = 0f; for (SkeletonConfigValue config : selection) { @@ -230,7 +289,10 @@ public class AutoBone { return getLengthSum(configs, null); } - public float getLengthSum(Map configs, Map configsAlt) { + public float getLengthSum( + Map configs, + Map configsAlt + ) { float length = 0f; if (configsAlt != null) { @@ -253,34 +315,66 @@ public class AutoBone { processFrames(frames, -1f, epochCallback); } - public void processFrames(PoseFrames frames, float targetHeight, Consumer epochCallback) { + public void processFrames( + PoseFrames frames, + float targetHeight, + Consumer epochCallback + ) { processFrames(frames, true, targetHeight, epochCallback); } - public float processFrames(PoseFrames frames, boolean calcInitError, float targetHeight, Consumer epochCallback) { + public float processFrames( + PoseFrames frames, + boolean calcInitError, + float targetHeight, + Consumer epochCallback + ) { final int frameCount = frames.getMaxFrameCount(); List trackers = frames.getTrackers(); - reloadConfigValues(trackers); // Reload configs and detect chest tracker from the first frame + reloadConfigValues(trackers); // Reload configs and detect chest tracker + // from the first frame - final PoseFrameSkeleton skeleton1 = new PoseFrameSkeleton(trackers, null, configs, staticConfigs); - final PoseFrameSkeleton skeleton2 = new PoseFrameSkeleton(trackers, null, configs, staticConfigs); + final PoseFrameSkeleton skeleton1 = new PoseFrameSkeleton( + trackers, + null, + configs, + staticConfigs + ); + final PoseFrameSkeleton skeleton2 = new PoseFrameSkeleton( + trackers, + null, + configs, + staticConfigs + ); // If target height isn't specified, auto-detect if (targetHeight < 0f) { // Get the current skeleton from the server HumanSkeleton skeleton = getSkeleton(); if (skeleton != null) { - // If there is a skeleton available, calculate the target height from its configs + // If there is a skeleton available, calculate the target height + // from its + // configs targetHeight = sumSelectConfigs(heightConfigs, skeleton.getSkeletonConfig()); - LogManager.log.warning("[AutoBone] Target height loaded from skeleton (Make sure you reset before running!): " + targetHeight); + LogManager + .warning( + "[AutoBone] Target height loaded from skeleton (Make sure you reset before running!): " + + targetHeight + ); } else { - // Otherwise if there is no skeleton available, attempt to get the max HMD height from the recording + // Otherwise if there is no skeleton available, attempt to get + // the max HMD + // height from the recording float hmdHeight = frames.getMaxHmdHeight(); if (hmdHeight <= 0.50f) { - LogManager.log.warning("[AutoBone] Max headset height detected (Value seems too low, did you not stand up straight while measuring?): " + hmdHeight); + LogManager + .warning( + "[AutoBone] Max headset height detected (Value seems too low, did you not stand up straight while measuring?): " + + hmdHeight + ); } else { - LogManager.log.info("[AutoBone] Max headset height detected: " + hmdHeight); + LogManager.info("[AutoBone] Max headset height detected: " + hmdHeight); } // Estimate target height from HMD height @@ -293,11 +387,20 @@ public class AutoBone { float sumError = 0f; int errorCount = 0; - float adjustRate = epoch >= 0 ? (initialAdjustRate / FastMath.pow(adjustRateDecay, epoch)) : 0f; + float adjustRate = epoch + >= 0 ? (initialAdjustRate / FastMath.pow(adjustRateDecay, epoch)) : 0f; - // Iterate over the frames using a cursor and an offset for comparing frames a certain number of frames apart - for (int cursorOffset = minDataDistance; cursorOffset <= maxDataDistance && cursorOffset < frameCount; cursorOffset++) { - for (int frameCursor = 0; frameCursor < frameCount - cursorOffset; frameCursor += cursorIncrement) { + // Iterate over the frames using a cursor and an offset for + // comparing frames a + // certain number of frames apart + for ( + int cursorOffset = minDataDistance; + cursorOffset <= maxDataDistance && cursorOffset < frameCount; cursorOffset++ + ) { + for ( + int frameCursor = 0; frameCursor < frameCount - cursorOffset; + frameCursor += cursorIncrement + ) { int frameCursor2 = frameCursor + cursorOffset; skeleton1.skeletonConfig.setConfigs(configs, null); @@ -311,14 +414,26 @@ public class AutoBone { float totalLength = getLengthSum(configs); float curHeight = sumSelectConfigs(heightConfigs, configs, staticConfigs); - //float scaleLength = sumSelectConfigs(lengthConfigs, configs, staticConfigs); - float errorDeriv = getErrorDeriv(frames, frameCursor, frameCursor2, skeleton1, skeleton2, targetHeight - curHeight, 1f); + // float scaleLength = sumSelectConfigs(lengthConfigs, + // configs, staticConfigs); + float errorDeriv = getErrorDeriv( + frames, + frameCursor, + frameCursor2, + skeleton1, + skeleton2, + targetHeight - curHeight, + 1f + ); float error = errorFunc(errorDeriv); // In case of fire if (Float.isNaN(error) || Float.isInfinite(error)) { // Extinguish - LogManager.log.warning("[AutoBone] Error value is invalid, resetting variables to recover"); + LogManager + .warning( + "[AutoBone] Error value is invalid, resetting variables to recover" + ); reloadConfigValues(trackers); // Reset error sum values @@ -341,7 +456,8 @@ public class AutoBone { } for (Entry entry : configs.entrySet()) { - // Skip adjustment if the epoch is before starting (for logging only) + // Skip adjustment if the epoch is before starting (for + // logging only) if (epoch < 0) { break; } @@ -350,12 +466,15 @@ public class AutoBone { // Try positive and negative adjustments boolean isHeightVar = heightConfigs.contains(entry.getKey()); - //boolean isLengthVar = lengthConfigs.contains(entry.getKey()); + // boolean isLengthVar = + // lengthConfigs.contains(entry.getKey()); float minError = errorDeriv; float finalNewLength = -1f; for (int i = 0; i < 2; i++) { - // Scale by the ratio for smooth adjustment and more stable results - float curAdjustVal = ((i == 0 ? adjustVal : -adjustVal) * originalLength) / totalLength; + // Scale by the ratio for smooth adjustment and more + // stable results + float curAdjustVal = ((i == 0 ? adjustVal : -adjustVal) + * originalLength) / totalLength; float newLength = originalLength + curAdjustVal; // No small or negative numbers!!! Bad algorithm! @@ -363,11 +482,26 @@ public class AutoBone { continue; } - updateSkeletonBoneLength(skeleton1, skeleton2, entry.getKey(), newLength); + updateSkeletonBoneLength( + skeleton1, + skeleton2, + entry.getKey(), + newLength + ); float newHeight = isHeightVar ? curHeight + curAdjustVal : curHeight; - //float newScaleLength = isLengthVar ? scaleLength + curAdjustVal : scaleLength; - float newErrorDeriv = getErrorDeriv(frames, frameCursor, frameCursor2, skeleton1, skeleton2, targetHeight - newHeight, 1f); + // float newScaleLength = isLengthVar ? scaleLength + // + curAdjustVal : + // scaleLength; + float newErrorDeriv = getErrorDeriv( + frames, + frameCursor, + frameCursor2, + skeleton1, + skeleton2, + targetHeight - newHeight, + 1f + ); if (newErrorDeriv < minError) { minError = newErrorDeriv; @@ -379,15 +513,21 @@ public class AutoBone { entry.setValue(finalNewLength); } - // Reset the length to minimize bias in other variables, it's applied later - updateSkeletonBoneLength(skeleton1, skeleton2, entry.getKey(), originalLength); + // Reset the length to minimize bias in other variables, + // it's applied later + updateSkeletonBoneLength( + skeleton1, + skeleton2, + entry.getKey(), + originalLength + ); } } } // Calculate average error over the epoch float avgError = errorCount > 0 ? sumError / errorCount : -1f; - LogManager.log.info("[AutoBone] Epoch " + (epoch + 1) + " average error: " + avgError); + LogManager.info("[AutoBone] Epoch " + (epoch + 1) + " average error: " + avgError); if (epochCallback != null) { epochCallback.accept(new Epoch(epoch + 1, avgError)); @@ -395,22 +535,30 @@ public class AutoBone { } float finalHeight = sumSelectConfigs(heightConfigs, configs, staticConfigs); - LogManager.log.info("[AutoBone] Target height: " + targetHeight + " New height: " + finalHeight); + LogManager + .info("[AutoBone] Target height: " + targetHeight + " New height: " + finalHeight); return FastMath.abs(finalHeight - targetHeight); } // The change in position of the ankle over time protected float getSlideErrorDeriv(PoseFrameSkeleton skeleton1, PoseFrameSkeleton skeleton2) { - float slideLeft = skeleton1.getComputedTracker(TrackerRole.LEFT_FOOT).position.distance(skeleton2.getComputedTracker(TrackerRole.LEFT_FOOT).position); - float slideRight = skeleton1.getComputedTracker(TrackerRole.RIGHT_FOOT).position.distance(skeleton2.getComputedTracker(TrackerRole.RIGHT_FOOT).position); + float slideLeft = skeleton1.getComputedTracker(TrackerRole.LEFT_FOOT).position + .distance(skeleton2.getComputedTracker(TrackerRole.LEFT_FOOT).position); + float slideRight = skeleton1.getComputedTracker(TrackerRole.RIGHT_FOOT).position + .distance(skeleton2.getComputedTracker(TrackerRole.RIGHT_FOOT).position); - // Divide by 4 to halve and average, it's halved because you want to approach a midpoint, not the other point + // Divide by 4 to halve and average, it's halved because you want to + // approach a + // midpoint, not the other point return (slideLeft + slideRight) / 4f; } // The change in distance between both of the ankles over time - protected float getOffsetSlideErrorDeriv(PoseFrameSkeleton skeleton1, PoseFrameSkeleton skeleton2) { + protected float getOffsetSlideErrorDeriv( + PoseFrameSkeleton skeleton1, + PoseFrameSkeleton skeleton2 + ) { Vector3f leftFoot1 = skeleton1.getComputedTracker(TrackerRole.LEFT_FOOT).position; Vector3f rightFoot1 = skeleton1.getComputedTracker(TrackerRole.RIGHT_FOOT).position; @@ -432,7 +580,9 @@ public class AutoBone { float dist5 = FastMath.abs(slideDist2 - slideDist3); float dist6 = FastMath.abs(slideDist2 - slideDist4); - // Divide by 12 to halve and average, it's halved because you want to approach a midpoint, not the other point + // Divide by 12 to halve and average, it's halved because you want to + // approach a + // midpoint, not the other point return (dist1 + dist2 + dist3 + dist4 + dist5 + dist6) / 12f; } @@ -453,7 +603,9 @@ public class AutoBone { float dist5 = FastMath.abs(leftFoot1 - leftFoot2); float dist6 = FastMath.abs(rightFoot1 - rightFoot2); - // Divide by 12 to halve and average, it's halved because you want to approach a midpoint, not the other point + // Divide by 12 to halve and average, it's halved because you want to + // approach a + // midpoint, not the other point return (dist1 + dist2 + dist3 + dist4 + dist5 + dist6) / 12f; } @@ -479,7 +631,11 @@ public class AutoBone { } // The distance of any points to the corresponding absolute position - protected float getPositionErrorDeriv(PoseFrames frames, int cursor, PoseFrameSkeleton skeleton) { + protected float getPositionErrorDeriv( + PoseFrames frames, + int cursor, + PoseFrameSkeleton skeleton + ) { float offset = 0f; int offsetCount = 0; @@ -490,7 +646,8 @@ public class AutoBone { continue; } - Vector3f nodePos = skeleton.getComputedTracker(trackerFrame.designation.trackerRole).position; + Vector3f nodePos = skeleton + .getComputedTracker(trackerFrame.designation.trackerRole).position; if (nodePos != null) { offset += FastMath.abs(nodePos.distance(trackerFrame.position)); offsetCount++; @@ -500,8 +657,15 @@ public class AutoBone { return offsetCount > 0 ? offset / offsetCount : 0f; } - // The difference between offset of absolute position and the corresponding point over time - protected float getPositionOffsetErrorDeriv(PoseFrames frames, int cursor1, int cursor2, PoseFrameSkeleton skeleton1, PoseFrameSkeleton skeleton2) { + // The difference between offset of absolute position and the corresponding + // point over time + protected float getPositionOffsetErrorDeriv( + PoseFrames frames, + int cursor1, + int cursor2, + PoseFrameSkeleton skeleton1, + PoseFrameSkeleton skeleton2 + ) { float offset = 0f; int offsetCount = 0; @@ -517,12 +681,14 @@ public class AutoBone { continue; } - Vector3f nodePos1 = skeleton1.getComputedTracker(trackerFrame1.designation.trackerRole).position; + Vector3f nodePos1 = skeleton1 + .getComputedTracker(trackerFrame1.designation.trackerRole).position; if (nodePos1 == null) { continue; } - Vector3f nodePos2 = skeleton2.getComputedTracker(trackerFrame2.designation.trackerRole).position; + Vector3f nodePos2 = skeleton2 + .getComputedTracker(trackerFrame2.designation.trackerRole).position; if (nodePos2 == null) { continue; } @@ -537,57 +703,94 @@ public class AutoBone { return offsetCount > 0 ? offset / offsetCount : 0f; } - protected float getErrorDeriv(PoseFrames frames, int cursor1, int cursor2, PoseFrameSkeleton skeleton1, PoseFrameSkeleton skeleton2, float heightChange, float distScale) { + protected float getErrorDeriv( + PoseFrames frames, + int cursor1, + int cursor2, + PoseFrameSkeleton skeleton1, + PoseFrameSkeleton skeleton2, + float heightChange, + float distScale + ) { float totalError = 0f; float sumWeight = 0f; if (slideErrorFactor > 0f) { - // This is the main error function, this calculates the distance between the foot positions on both frames + // This is the main error function, this calculates the distance + // between the + // foot positions on both frames totalError += getSlideErrorDeriv(skeleton1, skeleton2) * distScale * slideErrorFactor; sumWeight += slideErrorFactor; } if (offsetSlideErrorFactor > 0f) { - // This error function compares the distance between the feet on each frame and returns the offset between them - totalError += getOffsetSlideErrorDeriv(skeleton1, skeleton2) * distScale * offsetSlideErrorFactor; + // This error function compares the distance between the feet on + // each frame and + // returns the offset between them + totalError += getOffsetSlideErrorDeriv(skeleton1, skeleton2) + * distScale + * offsetSlideErrorFactor; sumWeight += offsetSlideErrorFactor; } if (offsetErrorFactor > 0f) { - // This error function compares the height of each foot in each frame + // This error function compares the height of each foot in each + // frame totalError += getOffsetErrorDeriv(skeleton1, skeleton2) * distScale * offsetErrorFactor; sumWeight += offsetErrorFactor; } if (proportionErrorFactor > 0f) { - // This error function compares the current values to general expected proportions to keep measurements in line + // This error function compares the current values to general + // expected + // proportions to keep measurements in line // Either skeleton will work fine, skeleton1 is used as a default totalError += getProportionErrorDeriv(skeleton1.skeletonConfig) * proportionErrorFactor; sumWeight += proportionErrorFactor; } if (heightErrorFactor > 0f) { - // This error function compares the height change to the actual measured height of the headset + // This error function compares the height change to the actual + // measured height + // of the headset totalError += FastMath.abs(heightChange) * heightErrorFactor; sumWeight += heightErrorFactor; } if (positionErrorFactor > 0f) { - // This error function compares the position of an assigned tracker with the position on the skeleton - totalError += (getPositionErrorDeriv(frames, cursor1, skeleton1) + getPositionErrorDeriv(frames, cursor2, skeleton2) / 2f) * distScale * positionErrorFactor; + // This error function compares the position of an assigned tracker + // with the + // position on the skeleton + totalError += (getPositionErrorDeriv(frames, cursor1, skeleton1) + + getPositionErrorDeriv(frames, cursor2, skeleton2) / 2f) + * distScale + * positionErrorFactor; sumWeight += positionErrorFactor; } if (positionOffsetErrorFactor > 0f) { - // This error function compares the offset of the position of an assigned tracker with the position on the skeleton - totalError += getPositionOffsetErrorDeriv(frames, cursor1, cursor2, skeleton1, skeleton2) * distScale * positionOffsetErrorFactor; + // This error function compares the offset of the position of an + // assigned + // tracker with the position on the skeleton + totalError += getPositionOffsetErrorDeriv( + frames, + cursor1, + cursor2, + skeleton1, + skeleton2 + ) * distScale * positionOffsetErrorFactor; sumWeight += positionOffsetErrorFactor; } return sumWeight > 0f ? totalError / sumWeight : 0f; } - protected void updateSkeletonBoneLength(PoseFrameSkeleton skeleton1, PoseFrameSkeleton skeleton2, SkeletonConfigValue config, float newLength) { + protected void updateSkeletonBoneLength( + PoseFrameSkeleton skeleton1, + PoseFrameSkeleton skeleton2, + SkeletonConfigValue config, + float newLength + ) { skeleton1.skeletonConfig.setConfig(config, newLength); skeleton1.updatePoseAffectedByConfig(config); @@ -616,14 +819,30 @@ public class AutoBone { saveRecording = new File(saveDir, "ABRecording" + recordingIndex++ + ".pfr"); } while (saveRecording.exists()); - LogManager.log.info("[AutoBone] Exporting frames to \"" + saveRecording.getPath() + "\"..."); + LogManager + .info("[AutoBone] Exporting frames to \"" + saveRecording.getPath() + "\"..."); if (PoseFrameIO.writeToFile(saveRecording, frames)) { - LogManager.log.info("[AutoBone] Done exporting! Recording can be found at \"" + saveRecording.getPath() + "\"."); + LogManager + .info( + "[AutoBone] Done exporting! Recording can be found at \"" + + saveRecording.getPath() + + "\"." + ); } else { - LogManager.log.severe("[AutoBone] Failed to export the recording to \"" + saveRecording.getPath() + "\"."); + LogManager + .severe( + "[AutoBone] Failed to export the recording to \"" + + saveRecording.getPath() + + "\"." + ); } } else { - LogManager.log.severe("[AutoBone] Failed to create the recording directory \"" + saveDir.getPath() + "\"."); + LogManager + .severe( + "[AutoBone] Failed to create the recording directory \"" + + saveDir.getPath() + + "\"." + ); } } @@ -633,12 +852,22 @@ public class AutoBone { File[] files = loadDir.listFiles(); if (files != null) { for (File file : files) { - if (file.isFile() && org.apache.commons.lang3.StringUtils.endsWithIgnoreCase(file.getName(), ".pfr")) { - LogManager.log.info("[AutoBone] Detected recording at \"" + file.getPath() + "\", loading frames..."); + if ( + file.isFile() + && org.apache.commons.lang3.StringUtils + .endsWithIgnoreCase(file.getName(), ".pfr") + ) { + LogManager + .info( + "[AutoBone] Detected recording at \"" + + file.getPath() + + "\", loading frames..." + ); PoseFrames frames = PoseFrameIO.readFromFile(file); if (frames == null) { - LogManager.log.severe("Reading frames from \"" + file.getPath() + "\" failed..."); + LogManager + .severe("Reading frames from \"" + file.getPath() + "\" failed..."); } else { recordings.add(Pair.of(file.getName(), frames)); } diff --git a/src/main/java/dev/slimevr/bridge/Bridge.java b/src/main/java/dev/slimevr/bridge/Bridge.java index 11f596c07..15b154beb 100644 --- a/src/main/java/dev/slimevr/bridge/Bridge.java +++ b/src/main/java/dev/slimevr/bridge/Bridge.java @@ -3,12 +3,12 @@ package dev.slimevr.bridge; import dev.slimevr.util.ann.VRServerThread; import dev.slimevr.vr.trackers.ShareableTracker; + /** - * Bridge handles sending and receiving tracker data - * between SlimeVR and other systems like VR APIs (SteamVR, OpenXR, etc), - * apps and protocols (VMC, WebSocket, TIP). It can create and manage - * tracker received from the remote side or send shared local - * trackers to the other side. + * Bridge handles sending and receiving tracker data between SlimeVR and other + * systems like VR APIs (SteamVR, OpenXR, etc), apps and protocols (VMC, + * WebSocket, TIP). It can create and manage tracker received from the remote + * side or send shared local trackers to the other side. */ public interface Bridge { @@ -19,9 +19,9 @@ public interface Bridge { void dataWrite(); /** - * Adds shared tracker to the bridge. Bridge should notify the - * other side of this tracker, if it's the type of tracker - * this bridge serves, and start sending data each update + * Adds shared tracker to the bridge. Bridge should notify the other side of + * this tracker, if it's the type of tracker this bridge serves, and start + * sending data each update * * @param tracker */ @@ -29,11 +29,10 @@ public interface Bridge { void addSharedTracker(ShareableTracker tracker); /** - * Removes tracker from a bridge. If the other side supports - * tracker removal, bridge should notify it and stop sending - * new data. If it doesn't support tracker removal, the bridge - * can either stop sending new data, or keep sending it if it's - * available. + * Removes tracker from a bridge. If the other side supports tracker + * removal, bridge should notify it and stop sending new data. If it doesn't + * support tracker removal, the bridge can either stop sending new data, or + * keep sending it if it's available. * * @param tracker */ diff --git a/src/main/java/dev/slimevr/bridge/BridgeThread.java b/src/main/java/dev/slimevr/bridge/BridgeThread.java index 2c903ae25..52f722424 100644 --- a/src/main/java/dev/slimevr/bridge/BridgeThread.java +++ b/src/main/java/dev/slimevr/bridge/BridgeThread.java @@ -3,6 +3,7 @@ package dev.slimevr.bridge; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; + @Retention(value = RetentionPolicy.SOURCE) public @interface BridgeThread { } diff --git a/src/main/java/dev/slimevr/bridge/OpenVRNativeBridge.java b/src/main/java/dev/slimevr/bridge/OpenVRNativeBridge.java index b43864749..72e047772 100644 --- a/src/main/java/dev/slimevr/bridge/OpenVRNativeBridge.java +++ b/src/main/java/dev/slimevr/bridge/OpenVRNativeBridge.java @@ -3,6 +3,7 @@ package dev.slimevr.bridge; import dev.slimevr.util.ann.VRServerThread; import dev.slimevr.vr.trackers.ShareableTracker; + public class OpenVRNativeBridge implements Bridge { public OpenVRNativeBridge() { diff --git a/src/main/java/dev/slimevr/bridge/ProtobufBridge.java b/src/main/java/dev/slimevr/bridge/ProtobufBridge.java index 99e74bbee..8f4ed0462 100644 --- a/src/main/java/dev/slimevr/bridge/ProtobufBridge.java +++ b/src/main/java/dev/slimevr/bridge/ProtobufBridge.java @@ -15,6 +15,7 @@ import java.util.*; import java.util.Map.Entry; import java.util.concurrent.LinkedBlockingQueue; + public abstract class ProtobufBridge implements Bridge { @VRServerThread @@ -86,7 +87,9 @@ public abstract class ProtobufBridge implements Bridge { @VRServerThread @Override public void dataWrite() { - if (!hadNewData) // Don't write anything if no message were received, we always process at the speed of the other side + if (!hadNewData) // Don't write anything if no message were received, we + // always process at the + // speed of the other side return; for (ShareableTracker tracker : sharedTrackers) { writeTrackerUpdate(tracker); @@ -112,8 +115,8 @@ public abstract class ProtobufBridge implements Bridge { @VRServerThread protected void processMessageReceived(ProtobufMessage message) { - //if(!message.hasPosition()) - // LogManager.log.info("[" + bridgeName + "] MSG: " + message); + // if(!message.hasPosition()) + // LogManager.log.info("[" + bridgeName + "] MSG: " + message); if (message.hasPosition()) { positionReceived(message.getPosition()); } else if (message.hasUserAction()) { @@ -130,8 +133,15 @@ public abstract class ProtobufBridge implements Bridge { T tracker = getInternalRemoteTrackerById(positionMessage.getTrackerId()); if (tracker != null) { if (positionMessage.hasX()) - tracker.position.set(positionMessage.getX(), positionMessage.getY(), positionMessage.getZ()); - tracker.rotation.set(positionMessage.getQx(), positionMessage.getQy(), positionMessage.getQz(), positionMessage.getQw()); + tracker.position + .set(positionMessage.getX(), positionMessage.getY(), positionMessage.getZ()); + tracker.rotation + .set( + positionMessage.getQx(), + positionMessage.getQy(), + positionMessage.getQz(), + positionMessage.getQw() + ); tracker.dataTick(); } } @@ -174,7 +184,10 @@ public abstract class ProtobufBridge implements Bridge { protected void trackerStatusReceived(TrackerStatus trackerStatus) { T tracker = getInternalRemoteTrackerById(trackerStatus.getTrackerId()); if (tracker != null) { - tracker.setStatus(dev.slimevr.vr.trackers.TrackerStatus.getById(trackerStatus.getStatusValue())); + tracker + .setStatus( + dev.slimevr.vr.trackers.TrackerStatus.getById(trackerStatus.getStatusValue()) + ); } } @@ -188,7 +201,12 @@ public abstract class ProtobufBridge implements Bridge { @VRServerThread protected void reconnected() { for (ShareableTracker tracker : sharedTrackers) { - TrackerAdded.Builder builder = TrackerAdded.newBuilder().setTrackerId(tracker.getTrackerId()).setTrackerName(tracker.getDescriptiveName()).setTrackerSerial(tracker.getName()).setTrackerRole(tracker.getTrackerRole().id); + TrackerAdded.Builder builder = TrackerAdded + .newBuilder() + .setTrackerId(tracker.getTrackerId()) + .setTrackerName(tracker.getDescriptiveName()) + .setTrackerSerial(tracker.getName()) + .setTrackerRole(tracker.getTrackerRole().id); sendMessage(ProtobufMessage.newBuilder().setTrackerAdded(builder).build()); } } @@ -198,7 +216,10 @@ public abstract class ProtobufBridge implements Bridge { synchronized (remoteTrackersByTrackerId) { Iterator> iterator = remoteTrackersByTrackerId.entrySet().iterator(); while (iterator.hasNext()) { - iterator.next().getValue().setStatus(dev.slimevr.vr.trackers.TrackerStatus.DISCONNECTED); + iterator + .next() + .getValue() + .setStatus(dev.slimevr.vr.trackers.TrackerStatus.DISCONNECTED); } } if (hmdTracker != null) { @@ -212,7 +233,12 @@ public abstract class ProtobufBridge implements Bridge { if (sharedTrackers.contains(tracker)) return; sharedTrackers.add(tracker); - TrackerAdded.Builder builder = TrackerAdded.newBuilder().setTrackerId(tracker.getTrackerId()).setTrackerName(tracker.getDescriptiveName()).setTrackerSerial(tracker.getName()).setTrackerRole(tracker.getTrackerRole().id); + TrackerAdded.Builder builder = TrackerAdded + .newBuilder() + .setTrackerId(tracker.getTrackerId()) + .setTrackerName(tracker.getDescriptiveName()) + .setTrackerSerial(tracker.getName()) + .setTrackerRole(tracker.getTrackerRole().id); sendMessage(ProtobufMessage.newBuilder().setTrackerAdded(builder).build()); } @@ -220,6 +246,8 @@ public abstract class ProtobufBridge implements Bridge { @Override public void removeSharedTracker(ShareableTracker tracker) { sharedTrackers.remove(tracker); - // No message can be sent to the remote side, protocol doesn't support tracker removal (yet) + // No message can be sent to the remote side, protocol doesn't support + // tracker + // removal (yet) } } diff --git a/src/main/java/dev/slimevr/bridge/ProtobufMessages.java b/src/main/java/dev/slimevr/bridge/ProtobufMessages.java index b5228a23a..7c248e191 100644 --- a/src/main/java/dev/slimevr/bridge/ProtobufMessages.java +++ b/src/main/java/dev/slimevr/bridge/ProtobufMessages.java @@ -4,163 +4,175 @@ package dev.slimevr.bridge; public final class ProtobufMessages { - private static final com.google.protobuf.Descriptors.Descriptor - internal_static_messages_PingPong_descriptor; - private static final - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_messages_PingPong_fieldAccessorTable; - private static final com.google.protobuf.Descriptors.Descriptor - internal_static_messages_Position_descriptor; - private static final - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_messages_Position_fieldAccessorTable; - private static final com.google.protobuf.Descriptors.Descriptor - internal_static_messages_UserAction_descriptor; - private static final - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_messages_UserAction_fieldAccessorTable; - private static final com.google.protobuf.Descriptors.Descriptor - internal_static_messages_UserAction_ActionArgumentsEntry_descriptor; - private static final - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_messages_UserAction_ActionArgumentsEntry_fieldAccessorTable; - private static final com.google.protobuf.Descriptors.Descriptor - internal_static_messages_TrackerAdded_descriptor; - private static final - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_messages_TrackerAdded_fieldAccessorTable; - private static final com.google.protobuf.Descriptors.Descriptor - internal_static_messages_TrackerStatus_descriptor; - private static final - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_messages_TrackerStatus_fieldAccessorTable; - private static final com.google.protobuf.Descriptors.Descriptor - internal_static_messages_TrackerStatus_ExtraEntry_descriptor; - private static final - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_messages_TrackerStatus_ExtraEntry_fieldAccessorTable; - private static final com.google.protobuf.Descriptors.Descriptor - internal_static_messages_ProtobufMessage_descriptor; - private static final - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_messages_ProtobufMessage_fieldAccessorTable; - private static final com.google.protobuf.Descriptors.FileDescriptor - descriptor; + private static final com.google.protobuf.Descriptors.Descriptor internal_static_messages_PingPong_descriptor; + private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_messages_PingPong_fieldAccessorTable; + private static final com.google.protobuf.Descriptors.Descriptor internal_static_messages_Position_descriptor; + private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_messages_Position_fieldAccessorTable; + private static final com.google.protobuf.Descriptors.Descriptor internal_static_messages_UserAction_descriptor; + private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_messages_UserAction_fieldAccessorTable; + private static final com.google.protobuf.Descriptors.Descriptor internal_static_messages_UserAction_ActionArgumentsEntry_descriptor; + private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_messages_UserAction_ActionArgumentsEntry_fieldAccessorTable; + private static final com.google.protobuf.Descriptors.Descriptor internal_static_messages_TrackerAdded_descriptor; + private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_messages_TrackerAdded_fieldAccessorTable; + private static final com.google.protobuf.Descriptors.Descriptor internal_static_messages_TrackerStatus_descriptor; + private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_messages_TrackerStatus_fieldAccessorTable; + private static final com.google.protobuf.Descriptors.Descriptor internal_static_messages_TrackerStatus_ExtraEntry_descriptor; + private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_messages_TrackerStatus_ExtraEntry_fieldAccessorTable; + private static final com.google.protobuf.Descriptors.Descriptor internal_static_messages_ProtobufMessage_descriptor; + private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_messages_ProtobufMessage_fieldAccessorTable; + private static final com.google.protobuf.Descriptors.FileDescriptor descriptor; static { java.lang.String[] descriptorData = { - "\n\026ProtobufMessages.proto\022\010messages\"\n\n\010Pi" + - "ngPong\"\223\002\n\010Position\022\022\n\ntracker_id\030\001 \001(\005\022" + - "\016\n\001x\030\002 \001(\002H\000\210\001\001\022\016\n\001y\030\003 \001(\002H\001\210\001\001\022\016\n\001z\030\004 \001" + - "(\002H\002\210\001\001\022\n\n\002qx\030\005 \001(\002\022\n\n\002qy\030\006 \001(\002\022\n\n\002qz\030\007 " + - "\001(\002\022\n\n\002qw\030\010 \001(\002\0227\n\013data_source\030\t \001(\0162\035.m" + - "essages.Position.DataSourceH\003\210\001\001\"8\n\nData" + - "Source\022\010\n\004NONE\020\000\022\007\n\003IMU\020\001\022\r\n\tPRECISION\020\002" + - "\022\010\n\004FULL\020\003B\004\n\002_xB\004\n\002_yB\004\n\002_zB\016\n\014_data_so" + - "urce\"\227\001\n\nUserAction\022\014\n\004name\030\001 \001(\t\022C\n\020act" + - "ion_arguments\030\002 \003(\0132).messages.UserActio" + - "n.ActionArgumentsEntry\0326\n\024ActionArgument" + - "sEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"f" + - "\n\014TrackerAdded\022\022\n\ntracker_id\030\001 \001(\005\022\026\n\016tr" + - "acker_serial\030\002 \001(\t\022\024\n\014tracker_name\030\003 \001(\t" + - "\022\024\n\014tracker_role\030\004 \001(\005\"\374\002\n\rTrackerStatus" + - "\022\022\n\ntracker_id\030\001 \001(\005\022.\n\006status\030\002 \001(\0162\036.m" + - "essages.TrackerStatus.Status\0221\n\005extra\030\003 " + - "\003(\0132\".messages.TrackerStatus.ExtraEntry\022" + - ";\n\nconfidence\030\004 \001(\0162\".messages.TrackerSt" + - "atus.ConfidenceH\000\210\001\001\032,\n\nExtraEntry\022\013\n\003ke" + - "y\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"E\n\006Status\022\020\n\014" + - "DISCONNECTED\020\000\022\006\n\002OK\020\001\022\010\n\004BUSY\020\002\022\t\n\005ERRO" + - "R\020\003\022\014\n\010OCCLUDED\020\004\"3\n\nConfidence\022\006\n\002NO\020\000\022" + - "\007\n\003LOW\020\001\022\n\n\006MEDIUM\020\005\022\010\n\004HIGH\020\nB\r\n\013_confi" + - "dence\"\325\001\n\017ProtobufMessage\022&\n\010position\030\001 " + - "\001(\0132\022.messages.PositionH\000\022+\n\013user_action" + - "\030\002 \001(\0132\024.messages.UserActionH\000\022/\n\rtracke" + - "r_added\030\003 \001(\0132\026.messages.TrackerAddedH\000\022" + - "1\n\016tracker_status\030\004 \001(\0132\027.messages.Track" + - "erStatusH\000B\t\n\007messageB&\n\022dev.slimevr.bri" + - "dgeB\020ProtobufMessagesb\006proto3" + "\n\026ProtobufMessages.proto\022\010messages\"\n\n\010Pi" + + + "ngPong\"\223\002\n\010Position\022\022\n\ntracker_id\030\001 \001(\005\022" + + + "\016\n\001x\030\002 \001(\002H\000\210\001\001\022\016\n\001y\030\003 \001(\002H\001\210\001\001\022\016\n\001z\030\004 \001" + + + "(\002H\002\210\001\001\022\n\n\002qx\030\005 \001(\002\022\n\n\002qy\030\006 \001(\002\022\n\n\002qz\030\007 " + + + "\001(\002\022\n\n\002qw\030\010 \001(\002\0227\n\013data_source\030\t \001(\0162\035.m" + + + "essages.Position.DataSourceH\003\210\001\001\"8\n\nData" + + + "Source\022\010\n\004NONE\020\000\022\007\n\003IMU\020\001\022\r\n\tPRECISION\020\002" + + + "\022\010\n\004FULL\020\003B\004\n\002_xB\004\n\002_yB\004\n\002_zB\016\n\014_data_so" + + + "urce\"\227\001\n\nUserAction\022\014\n\004name\030\001 \001(\t\022C\n\020act" + + + "ion_arguments\030\002 \003(\0132).messages.UserActio" + + + "n.ActionArgumentsEntry\0326\n\024ActionArgument" + + + "sEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"f" + + + "\n\014TrackerAdded\022\022\n\ntracker_id\030\001 \001(\005\022\026\n\016tr" + + + "acker_serial\030\002 \001(\t\022\024\n\014tracker_name\030\003 \001(\t" + + + "\022\024\n\014tracker_role\030\004 \001(\005\"\374\002\n\rTrackerStatus" + + + "\022\022\n\ntracker_id\030\001 \001(\005\022.\n\006status\030\002 \001(\0162\036.m" + + + "essages.TrackerStatus.Status\0221\n\005extra\030\003 " + + + "\003(\0132\".messages.TrackerStatus.ExtraEntry\022" + + + ";\n\nconfidence\030\004 \001(\0162\".messages.TrackerSt" + + + "atus.ConfidenceH\000\210\001\001\032,\n\nExtraEntry\022\013\n\003ke" + + + "y\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"E\n\006Status\022\020\n\014" + + + "DISCONNECTED\020\000\022\006\n\002OK\020\001\022\010\n\004BUSY\020\002\022\t\n\005ERRO" + + + "R\020\003\022\014\n\010OCCLUDED\020\004\"3\n\nConfidence\022\006\n\002NO\020\000\022" + + + "\007\n\003LOW\020\001\022\n\n\006MEDIUM\020\005\022\010\n\004HIGH\020\nB\r\n\013_confi" + + + "dence\"\325\001\n\017ProtobufMessage\022&\n\010position\030\001 " + + + "\001(\0132\022.messages.PositionH\000\022+\n\013user_action" + + + "\030\002 \001(\0132\024.messages.UserActionH\000\022/\n\rtracke" + + + "r_added\030\003 \001(\0132\026.messages.TrackerAddedH\000\022" + + + "1\n\016tracker_status\030\004 \001(\0132\027.messages.Track" + + + "erStatusH\000B\t\n\007messageB&\n\022dev.slimevr.bri" + + + "dgeB\020ProtobufMessagesb\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor - .internalBuildGeneratedFileFrom(descriptorData, - new com.google.protobuf.Descriptors.FileDescriptor[]{ - }); - internal_static_messages_PingPong_descriptor = - getDescriptor().getMessageTypes().get(0); - internal_static_messages_PingPong_fieldAccessorTable = new - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_messages_PingPong_descriptor, - new java.lang.String[]{}); - internal_static_messages_Position_descriptor = - getDescriptor().getMessageTypes().get(1); - internal_static_messages_Position_fieldAccessorTable = new - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_messages_Position_descriptor, - new java.lang.String[]{"TrackerId", "X", "Y", "Z", "Qx", "Qy", "Qz", "Qw", "DataSource", "X", "Y", "Z", "DataSource",}); - internal_static_messages_UserAction_descriptor = - getDescriptor().getMessageTypes().get(2); - internal_static_messages_UserAction_fieldAccessorTable = new - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_messages_UserAction_descriptor, - new java.lang.String[]{"Name", "ActionArguments",}); - internal_static_messages_UserAction_ActionArgumentsEntry_descriptor = - internal_static_messages_UserAction_descriptor.getNestedTypes().get(0); - internal_static_messages_UserAction_ActionArgumentsEntry_fieldAccessorTable = new - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_messages_UserAction_ActionArgumentsEntry_descriptor, - new java.lang.String[]{"Key", "Value",}); - internal_static_messages_TrackerAdded_descriptor = - getDescriptor().getMessageTypes().get(3); - internal_static_messages_TrackerAdded_fieldAccessorTable = new - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_messages_TrackerAdded_descriptor, - new java.lang.String[]{"TrackerId", "TrackerSerial", "TrackerName", "TrackerRole",}); - internal_static_messages_TrackerStatus_descriptor = - getDescriptor().getMessageTypes().get(4); - internal_static_messages_TrackerStatus_fieldAccessorTable = new - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_messages_TrackerStatus_descriptor, - new java.lang.String[]{"TrackerId", "Status", "Extra", "Confidence", "Confidence",}); - internal_static_messages_TrackerStatus_ExtraEntry_descriptor = - internal_static_messages_TrackerStatus_descriptor.getNestedTypes().get(0); - internal_static_messages_TrackerStatus_ExtraEntry_fieldAccessorTable = new - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_messages_TrackerStatus_ExtraEntry_descriptor, - new java.lang.String[]{"Key", "Value",}); - internal_static_messages_ProtobufMessage_descriptor = - getDescriptor().getMessageTypes().get(5); - internal_static_messages_ProtobufMessage_fieldAccessorTable = new - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_messages_ProtobufMessage_descriptor, - new java.lang.String[]{"Position", "UserAction", "TrackerAdded", "TrackerStatus", "Message",}); + .internalBuildGeneratedFileFrom( + descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + } + ); + internal_static_messages_PingPong_descriptor = getDescriptor().getMessageTypes().get(0); + internal_static_messages_PingPong_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_messages_PingPong_descriptor, + new java.lang.String[] {} + ); + internal_static_messages_Position_descriptor = getDescriptor().getMessageTypes().get(1); + internal_static_messages_Position_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_messages_Position_descriptor, + new java.lang.String[] { "TrackerId", "X", "Y", "Z", "Qx", "Qy", "Qz", "Qw", + "DataSource", "X", "Y", + "Z", "DataSource", } + ); + internal_static_messages_UserAction_descriptor = getDescriptor().getMessageTypes().get(2); + internal_static_messages_UserAction_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_messages_UserAction_descriptor, + new java.lang.String[] { "Name", "ActionArguments", } + ); + internal_static_messages_UserAction_ActionArgumentsEntry_descriptor = internal_static_messages_UserAction_descriptor + .getNestedTypes() + .get(0); + internal_static_messages_UserAction_ActionArgumentsEntry_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_messages_UserAction_ActionArgumentsEntry_descriptor, + new java.lang.String[] { "Key", "Value", } + ); + internal_static_messages_TrackerAdded_descriptor = getDescriptor().getMessageTypes().get(3); + internal_static_messages_TrackerAdded_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_messages_TrackerAdded_descriptor, + new java.lang.String[] { "TrackerId", "TrackerSerial", "TrackerName", "TrackerRole", } + ); + internal_static_messages_TrackerStatus_descriptor = getDescriptor() + .getMessageTypes() + .get(4); + internal_static_messages_TrackerStatus_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_messages_TrackerStatus_descriptor, + new java.lang.String[] { "TrackerId", "Status", "Extra", "Confidence", "Confidence", } + ); + internal_static_messages_TrackerStatus_ExtraEntry_descriptor = internal_static_messages_TrackerStatus_descriptor + .getNestedTypes() + .get(0); + internal_static_messages_TrackerStatus_ExtraEntry_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_messages_TrackerStatus_ExtraEntry_descriptor, + new java.lang.String[] { "Key", "Value", } + ); + internal_static_messages_ProtobufMessage_descriptor = getDescriptor() + .getMessageTypes() + .get(5); + internal_static_messages_ProtobufMessage_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_messages_ProtobufMessage_descriptor, + new java.lang.String[] { "Position", "UserAction", "TrackerAdded", "TrackerStatus", + "Message", } + ); } private ProtobufMessages() { } public static void registerAllExtensions( - com.google.protobuf.ExtensionRegistryLite registry) { + com.google.protobuf.ExtensionRegistryLite registry + ) { } public static void registerAllExtensions( - com.google.protobuf.ExtensionRegistry registry) { + com.google.protobuf.ExtensionRegistry registry + ) { registerAllExtensions( - (com.google.protobuf.ExtensionRegistryLite) registry); + (com.google.protobuf.ExtensionRegistryLite) registry + ); } - public static com.google.protobuf.Descriptors.FileDescriptor - getDescriptor() { + public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { return descriptor; } public interface PingPongOrBuilder extends - // @@protoc_insertion_point(interface_extends:messages.PingPong) - com.google.protobuf.MessageOrBuilder { + // @@protoc_insertion_point(interface_extends:messages.PingPong) + com.google.protobuf.MessageOrBuilder { } public interface PositionOrBuilder extends - // @@protoc_insertion_point(interface_extends:messages.Position) - com.google.protobuf.MessageOrBuilder { + // @@protoc_insertion_point(interface_extends:messages.Position) + com.google.protobuf.MessageOrBuilder { /** * int32 tracker_id = 1; @@ -262,8 +274,8 @@ public final class ProtobufMessages { } public interface UserActionOrBuilder extends - // @@protoc_insertion_point(interface_extends:messages.UserAction) - com.google.protobuf.MessageOrBuilder { + // @@protoc_insertion_point(interface_extends:messages.UserAction) + com.google.protobuf.MessageOrBuilder { /** * string name = 1; @@ -277,8 +289,7 @@ public final class ProtobufMessages { * * @return The bytes for name. */ - com.google.protobuf.ByteString - getNameBytes(); + com.google.protobuf.ByteString getNameBytes(); /** * map<string, string> action_arguments = 2; @@ -289,40 +300,41 @@ public final class ProtobufMessages { * map<string, string> action_arguments = 2; */ boolean containsActionArguments( - java.lang.String key); + java.lang.String key + ); /** * Use {@link #getActionArgumentsMap()} instead. */ @java.lang.Deprecated - java.util.Map - getActionArguments(); + java.util.Map getActionArguments(); /** * map<string, string> action_arguments = 2; */ - java.util.Map - getActionArgumentsMap(); + java.util.Map getActionArgumentsMap(); /** * map<string, string> action_arguments = 2; */ java.lang.String getActionArgumentsOrDefault( - java.lang.String key, - java.lang.String defaultValue); + java.lang.String key, + java.lang.String defaultValue + ); /** * map<string, string> action_arguments = 2; */ java.lang.String getActionArgumentsOrThrow( - java.lang.String key); + java.lang.String key + ); } public interface TrackerAddedOrBuilder extends - // @@protoc_insertion_point(interface_extends:messages.TrackerAdded) - com.google.protobuf.MessageOrBuilder { + // @@protoc_insertion_point(interface_extends:messages.TrackerAdded) + com.google.protobuf.MessageOrBuilder { /** * int32 tracker_id = 1; @@ -343,8 +355,7 @@ public final class ProtobufMessages { * * @return The bytes for trackerSerial. */ - com.google.protobuf.ByteString - getTrackerSerialBytes(); + com.google.protobuf.ByteString getTrackerSerialBytes(); /** * string tracker_name = 3; @@ -358,8 +369,7 @@ public final class ProtobufMessages { * * @return The bytes for trackerName. */ - com.google.protobuf.ByteString - getTrackerNameBytes(); + com.google.protobuf.ByteString getTrackerNameBytes(); /** * int32 tracker_role = 4; @@ -370,8 +380,8 @@ public final class ProtobufMessages { } public interface TrackerStatusOrBuilder extends - // @@protoc_insertion_point(interface_extends:messages.TrackerStatus) - com.google.protobuf.MessageOrBuilder { + // @@protoc_insertion_point(interface_extends:messages.TrackerStatus) + com.google.protobuf.MessageOrBuilder { /** * int32 tracker_id = 1; @@ -403,35 +413,36 @@ public final class ProtobufMessages { * map<string, string> extra = 3; */ boolean containsExtra( - java.lang.String key); + java.lang.String key + ); /** * Use {@link #getExtraMap()} instead. */ @java.lang.Deprecated - java.util.Map - getExtra(); + java.util.Map getExtra(); /** * map<string, string> extra = 3; */ - java.util.Map - getExtraMap(); + java.util.Map getExtraMap(); /** * map<string, string> extra = 3; */ java.lang.String getExtraOrDefault( - java.lang.String key, - java.lang.String defaultValue); + java.lang.String key, + java.lang.String defaultValue + ); /** * map<string, string> extra = 3; */ java.lang.String getExtraOrThrow( - java.lang.String key); + java.lang.String key + ); /** * .messages.TrackerStatus.Confidence confidence = 4; @@ -456,8 +467,8 @@ public final class ProtobufMessages { } public interface ProtobufMessageOrBuilder extends - // @@protoc_insertion_point(interface_extends:messages.ProtobufMessage) - com.google.protobuf.MessageOrBuilder { + // @@protoc_insertion_point(interface_extends:messages.ProtobufMessage) + com.google.protobuf.MessageOrBuilder { /** * .messages.Position position = 1; @@ -542,19 +553,19 @@ public final class ProtobufMessages { * Protobuf type {@code messages.PingPong} */ public static final class PingPong extends - com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:messages.PingPong) - PingPongOrBuilder { + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:messages.PingPong) + PingPongOrBuilder { private static final long serialVersionUID = 0L; // @@protoc_insertion_point(class_scope:messages.PingPong) private static final dev.slimevr.bridge.ProtobufMessages.PingPong DEFAULT_INSTANCE; - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { + private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { @java.lang.Override public PingPong parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws com.google.protobuf.InvalidProtocolBufferException { return new PingPong(input, extensionRegistry); } }; @@ -574,15 +585,16 @@ public final class ProtobufMessages { } private PingPong( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws com.google.protobuf.InvalidProtocolBufferException { this(); if (extensionRegistry == null) { throw new java.lang.NullPointerException(); } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); + com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet + .newBuilder(); try { boolean done = false; while (!done) { @@ -592,8 +604,14 @@ public final class ProtobufMessages { done = true; break; default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { + if ( + !parseUnknownField( + input, + unknownFields, + extensionRegistry, + tag + ) + ) { done = true; } break; @@ -604,97 +622,110 @@ public final class ProtobufMessages { throw e.setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); + e + ).setUnfinishedMessage(this); } finally { this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return dev.slimevr.bridge.ProtobufMessages.internal_static_messages_PingPong_descriptor; } public static dev.slimevr.bridge.ProtobufMessages.PingPong parseFrom( - java.nio.ByteBuffer data) - throws com.google.protobuf.InvalidProtocolBufferException { + java.nio.ByteBuffer data + ) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } public static dev.slimevr.bridge.ProtobufMessages.PingPong parseFrom( - java.nio.ByteBuffer data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } public static dev.slimevr.bridge.ProtobufMessages.PingPong parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { + com.google.protobuf.ByteString data + ) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } public static dev.slimevr.bridge.ProtobufMessages.PingPong parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } public static dev.slimevr.bridge.ProtobufMessages.PingPong parseFrom(byte[] data) - throws com.google.protobuf.InvalidProtocolBufferException { + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } public static dev.slimevr.bridge.ProtobufMessages.PingPong parseFrom( - byte[] data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static dev.slimevr.bridge.ProtobufMessages.PingPong parseFrom(java.io.InputStream input) - throws java.io.IOException { + public static dev.slimevr.bridge.ProtobufMessages.PingPong parseFrom( + java.io.InputStream input + ) + throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input); + .parseWithIOException(PARSER, input); } public static dev.slimevr.bridge.ProtobufMessages.PingPong parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input, extensionRegistry); - } - - public static dev.slimevr.bridge.ProtobufMessages.PingPong parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseDelimitedWithIOException(PARSER, input); + .parseWithIOException(PARSER, input, extensionRegistry); } public static dev.slimevr.bridge.ProtobufMessages.PingPong parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { + java.io.InputStream input + ) + throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 - .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + .parseDelimitedWithIOException(PARSER, input); + } + + public static dev.slimevr.bridge.ProtobufMessages.PingPong parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } public static dev.slimevr.bridge.ProtobufMessages.PingPong parseFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { + com.google.protobuf.CodedInputStream input + ) + throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input); + .parseWithIOException(PARSER, input); } public static dev.slimevr.bridge.ProtobufMessages.PingPong parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input, extensionRegistry); + .parseWithIOException(PARSER, input, extensionRegistry); } public static Builder newBuilder() { @@ -714,31 +745,34 @@ public final class ProtobufMessages { } @java.lang.Override - @SuppressWarnings({"unused"}) + @SuppressWarnings({ "unused" }) protected java.lang.Object newInstance( - UnusedPrivateParameter unused) { + UnusedPrivateParameter unused + ) { return new PingPong(); } @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { + public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return dev.slimevr.bridge.ProtobufMessages.internal_static_messages_PingPong_fieldAccessorTable - .ensureFieldAccessorsInitialized( - dev.slimevr.bridge.ProtobufMessages.PingPong.class, dev.slimevr.bridge.ProtobufMessages.PingPong.Builder.class); + .ensureFieldAccessorsInitialized( + dev.slimevr.bridge.ProtobufMessages.PingPong.class, + dev.slimevr.bridge.ProtobufMessages.PingPong.Builder.class + ); } @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; - if (isInitialized == 1) return true; - if (isInitialized == 0) return false; + if (isInitialized == 1) + return true; + if (isInitialized == 0) + return false; memoizedIsInitialized = 1; return true; @@ -746,14 +780,15 @@ public final class ProtobufMessages { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { + throws java.io.IOException { unknownFields.writeTo(output); } @java.lang.Override public int getSerializedSize() { int size = memoizedSize; - if (size != -1) return size; + if (size != -1) + return size; size = 0; size += unknownFields.getSerializedSize(); @@ -794,12 +829,14 @@ public final class ProtobufMessages { @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE - ? new Builder() : new Builder().mergeFrom(this); + ? new Builder() + : new Builder().mergeFrom(this); } @java.lang.Override protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + com.google.protobuf.GeneratedMessageV3.BuilderParent parent + ) { Builder builder = new Builder(parent); return builder; } @@ -818,37 +855,37 @@ public final class ProtobufMessages { * Protobuf type {@code messages.PingPong} */ public static final class Builder extends - com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:messages.PingPong) - dev.slimevr.bridge.ProtobufMessages.PingPongOrBuilder { - // Construct using dev.slimevr.bridge.ProtobufMessages.PingPong.newBuilder() + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:messages.PingPong) + dev.slimevr.bridge.ProtobufMessages.PingPongOrBuilder { + // Construct using + // dev.slimevr.bridge.ProtobufMessages.PingPong.newBuilder() private Builder() { maybeForceBuilderInitialization(); } private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + com.google.protobuf.GeneratedMessageV3.BuilderParent parent + ) { super(parent); maybeForceBuilderInitialization(); } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return dev.slimevr.bridge.ProtobufMessages.internal_static_messages_PingPong_descriptor; } @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return dev.slimevr.bridge.ProtobufMessages.internal_static_messages_PingPong_fieldAccessorTable - .ensureFieldAccessorsInitialized( - dev.slimevr.bridge.ProtobufMessages.PingPong.class, dev.slimevr.bridge.ProtobufMessages.PingPong.Builder.class); + .ensureFieldAccessorsInitialized( + dev.slimevr.bridge.ProtobufMessages.PingPong.class, + dev.slimevr.bridge.ProtobufMessages.PingPong.Builder.class + ); } private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } + if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -858,8 +895,7 @@ public final class ProtobufMessages { } @java.lang.Override - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return dev.slimevr.bridge.ProtobufMessages.internal_static_messages_PingPong_descriptor; } @@ -879,7 +915,9 @@ public final class ProtobufMessages { @java.lang.Override public dev.slimevr.bridge.ProtobufMessages.PingPong buildPartial() { - dev.slimevr.bridge.ProtobufMessages.PingPong result = new dev.slimevr.bridge.ProtobufMessages.PingPong(this); + dev.slimevr.bridge.ProtobufMessages.PingPong result = new dev.slimevr.bridge.ProtobufMessages.PingPong( + this + ); onBuilt(); return result; } @@ -891,34 +929,40 @@ public final class ProtobufMessages { @java.lang.Override public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value + ) { return super.setField(field, value); } @java.lang.Override public Builder clearField( - com.google.protobuf.Descriptors.FieldDescriptor field) { + com.google.protobuf.Descriptors.FieldDescriptor field + ) { return super.clearField(field); } @java.lang.Override public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { + com.google.protobuf.Descriptors.OneofDescriptor oneof + ) { return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, + java.lang.Object value + ) { return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value + ) { return super.addRepeatedField(field, value); } @@ -933,7 +977,8 @@ public final class ProtobufMessages { } public Builder mergeFrom(dev.slimevr.bridge.ProtobufMessages.PingPong other) { - if (other == dev.slimevr.bridge.ProtobufMessages.PingPong.getDefaultInstance()) return this; + if (other == dev.slimevr.bridge.ProtobufMessages.PingPong.getDefaultInstance()) + return this; this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -946,14 +991,16 @@ public final class ProtobufMessages { @java.lang.Override public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws java.io.IOException { dev.slimevr.bridge.ProtobufMessages.PingPong parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (dev.slimevr.bridge.ProtobufMessages.PingPong) e.getUnfinishedMessage(); + parsedMessage = (dev.slimevr.bridge.ProtobufMessages.PingPong) e + .getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -965,13 +1012,15 @@ public final class ProtobufMessages { @java.lang.Override public final Builder setUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { + final com.google.protobuf.UnknownFieldSet unknownFields + ) { return super.setUnknownFields(unknownFields); } @java.lang.Override public final Builder mergeUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { + final com.google.protobuf.UnknownFieldSet unknownFields + ) { return super.mergeUnknownFields(unknownFields); } @@ -983,9 +1032,9 @@ public final class ProtobufMessages { * Protobuf type {@code messages.Position} */ public static final class Position extends - com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:messages.Position) - PositionOrBuilder { + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:messages.Position) + PositionOrBuilder { public static final int TRACKER_ID_FIELD_NUMBER = 1; public static final int X_FIELD_NUMBER = 2; public static final int Y_FIELD_NUMBER = 3; @@ -998,13 +1047,13 @@ public final class ProtobufMessages { private static final long serialVersionUID = 0L; // @@protoc_insertion_point(class_scope:messages.Position) private static final dev.slimevr.bridge.ProtobufMessages.Position DEFAULT_INSTANCE; - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { + private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { @java.lang.Override public Position parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws com.google.protobuf.InvalidProtocolBufferException { return new Position(input, extensionRegistry); } }; @@ -1035,16 +1084,17 @@ public final class ProtobufMessages { } private Position( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws com.google.protobuf.InvalidProtocolBufferException { this(); if (extensionRegistry == null) { throw new java.lang.NullPointerException(); } int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); + com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet + .newBuilder(); try { boolean done = false; while (!done) { @@ -1100,8 +1150,14 @@ public final class ProtobufMessages { break; } default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { + if ( + !parseUnknownField( + input, + unknownFields, + extensionRegistry, + tag + ) + ) { done = true; } break; @@ -1112,97 +1168,110 @@ public final class ProtobufMessages { throw e.setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); + e + ).setUnfinishedMessage(this); } finally { this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return dev.slimevr.bridge.ProtobufMessages.internal_static_messages_Position_descriptor; } public static dev.slimevr.bridge.ProtobufMessages.Position parseFrom( - java.nio.ByteBuffer data) - throws com.google.protobuf.InvalidProtocolBufferException { + java.nio.ByteBuffer data + ) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } public static dev.slimevr.bridge.ProtobufMessages.Position parseFrom( - java.nio.ByteBuffer data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } public static dev.slimevr.bridge.ProtobufMessages.Position parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { + com.google.protobuf.ByteString data + ) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } public static dev.slimevr.bridge.ProtobufMessages.Position parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } public static dev.slimevr.bridge.ProtobufMessages.Position parseFrom(byte[] data) - throws com.google.protobuf.InvalidProtocolBufferException { + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } public static dev.slimevr.bridge.ProtobufMessages.Position parseFrom( - byte[] data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static dev.slimevr.bridge.ProtobufMessages.Position parseFrom(java.io.InputStream input) - throws java.io.IOException { + public static dev.slimevr.bridge.ProtobufMessages.Position parseFrom( + java.io.InputStream input + ) + throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input); + .parseWithIOException(PARSER, input); } public static dev.slimevr.bridge.ProtobufMessages.Position parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input, extensionRegistry); - } - - public static dev.slimevr.bridge.ProtobufMessages.Position parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseDelimitedWithIOException(PARSER, input); + .parseWithIOException(PARSER, input, extensionRegistry); } public static dev.slimevr.bridge.ProtobufMessages.Position parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { + java.io.InputStream input + ) + throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 - .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + .parseDelimitedWithIOException(PARSER, input); + } + + public static dev.slimevr.bridge.ProtobufMessages.Position parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } public static dev.slimevr.bridge.ProtobufMessages.Position parseFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { + com.google.protobuf.CodedInputStream input + ) + throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input); + .parseWithIOException(PARSER, input); } public static dev.slimevr.bridge.ProtobufMessages.Position parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input, extensionRegistry); + .parseWithIOException(PARSER, input, extensionRegistry); } public static Builder newBuilder() { @@ -1222,24 +1291,25 @@ public final class ProtobufMessages { } @java.lang.Override - @SuppressWarnings({"unused"}) + @SuppressWarnings({ "unused" }) protected java.lang.Object newInstance( - UnusedPrivateParameter unused) { + UnusedPrivateParameter unused + ) { return new Position(); } @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { + public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return dev.slimevr.bridge.ProtobufMessages.internal_static_messages_Position_fieldAccessorTable - .ensureFieldAccessorsInitialized( - dev.slimevr.bridge.ProtobufMessages.Position.class, dev.slimevr.bridge.ProtobufMessages.Position.Builder.class); + .ensureFieldAccessorsInitialized( + dev.slimevr.bridge.ProtobufMessages.Position.class, + dev.slimevr.bridge.ProtobufMessages.Position.Builder.class + ); } /** @@ -1380,15 +1450,20 @@ public final class ProtobufMessages { @java.lang.Override public dev.slimevr.bridge.ProtobufMessages.Position.DataSource getDataSource() { @SuppressWarnings("deprecation") - dev.slimevr.bridge.ProtobufMessages.Position.DataSource result = dev.slimevr.bridge.ProtobufMessages.Position.DataSource.valueOf(dataSource_); - return result == null ? dev.slimevr.bridge.ProtobufMessages.Position.DataSource.UNRECOGNIZED : result; + dev.slimevr.bridge.ProtobufMessages.Position.DataSource result = dev.slimevr.bridge.ProtobufMessages.Position.DataSource + .valueOf(dataSource_); + return result == null + ? dev.slimevr.bridge.ProtobufMessages.Position.DataSource.UNRECOGNIZED + : result; } @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; - if (isInitialized == 1) return true; - if (isInitialized == 0) return false; + if (isInitialized == 1) + return true; + if (isInitialized == 0) + return false; memoizedIsInitialized = 1; return true; @@ -1396,7 +1471,7 @@ public final class ProtobufMessages { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { + throws java.io.IOException { if (trackerId_ != 0) { output.writeInt32(1, trackerId_); } @@ -1430,44 +1505,45 @@ public final class ProtobufMessages { @java.lang.Override public int getSerializedSize() { int size = memoizedSize; - if (size != -1) return size; + if (size != -1) + return size; size = 0; if (trackerId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(1, trackerId_); + .computeInt32Size(1, trackerId_); } if (((bitField0_ & 0x00000001) != 0)) { size += com.google.protobuf.CodedOutputStream - .computeFloatSize(2, x_); + .computeFloatSize(2, x_); } if (((bitField0_ & 0x00000002) != 0)) { size += com.google.protobuf.CodedOutputStream - .computeFloatSize(3, y_); + .computeFloatSize(3, y_); } if (((bitField0_ & 0x00000004) != 0)) { size += com.google.protobuf.CodedOutputStream - .computeFloatSize(4, z_); + .computeFloatSize(4, z_); } if (qx_ != 0F) { size += com.google.protobuf.CodedOutputStream - .computeFloatSize(5, qx_); + .computeFloatSize(5, qx_); } if (qy_ != 0F) { size += com.google.protobuf.CodedOutputStream - .computeFloatSize(6, qy_); + .computeFloatSize(6, qy_); } if (qz_ != 0F) { size += com.google.protobuf.CodedOutputStream - .computeFloatSize(7, qz_); + .computeFloatSize(7, qz_); } if (qw_ != 0F) { size += com.google.protobuf.CodedOutputStream - .computeFloatSize(8, qw_); + .computeFloatSize(8, qw_); } if (((bitField0_ & 0x00000008) != 0)) { size += com.google.protobuf.CodedOutputStream - .computeEnumSize(9, dataSource_); + .computeEnumSize(9, dataSource_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -1484,41 +1560,81 @@ public final class ProtobufMessages { } dev.slimevr.bridge.ProtobufMessages.Position other = (dev.slimevr.bridge.ProtobufMessages.Position) obj; - if (getTrackerId() - != other.getTrackerId()) return false; - if (hasX() != other.hasX()) return false; + if (getTrackerId() != other.getTrackerId()) + return false; + if (hasX() != other.hasX()) + return false; if (hasX()) { - if (java.lang.Float.floatToIntBits(getX()) - != java.lang.Float.floatToIntBits( - other.getX())) return false; + if ( + java.lang.Float.floatToIntBits(getX()) + != java.lang.Float + .floatToIntBits( + other.getX() + ) + ) + return false; } - if (hasY() != other.hasY()) return false; + if (hasY() != other.hasY()) + return false; if (hasY()) { - if (java.lang.Float.floatToIntBits(getY()) - != java.lang.Float.floatToIntBits( - other.getY())) return false; + if ( + java.lang.Float.floatToIntBits(getY()) + != java.lang.Float + .floatToIntBits( + other.getY() + ) + ) + return false; } - if (hasZ() != other.hasZ()) return false; + if (hasZ() != other.hasZ()) + return false; if (hasZ()) { - if (java.lang.Float.floatToIntBits(getZ()) - != java.lang.Float.floatToIntBits( - other.getZ())) return false; + if ( + java.lang.Float.floatToIntBits(getZ()) + != java.lang.Float + .floatToIntBits( + other.getZ() + ) + ) + return false; } - if (java.lang.Float.floatToIntBits(getQx()) - != java.lang.Float.floatToIntBits( - other.getQx())) return false; - if (java.lang.Float.floatToIntBits(getQy()) - != java.lang.Float.floatToIntBits( - other.getQy())) return false; - if (java.lang.Float.floatToIntBits(getQz()) - != java.lang.Float.floatToIntBits( - other.getQz())) return false; - if (java.lang.Float.floatToIntBits(getQw()) - != java.lang.Float.floatToIntBits( - other.getQw())) return false; - if (hasDataSource() != other.hasDataSource()) return false; + if ( + java.lang.Float.floatToIntBits(getQx()) + != java.lang.Float + .floatToIntBits( + other.getQx() + ) + ) + return false; + if ( + java.lang.Float.floatToIntBits(getQy()) + != java.lang.Float + .floatToIntBits( + other.getQy() + ) + ) + return false; + if ( + java.lang.Float.floatToIntBits(getQz()) + != java.lang.Float + .floatToIntBits( + other.getQz() + ) + ) + return false; + if ( + java.lang.Float.floatToIntBits(getQw()) + != java.lang.Float + .floatToIntBits( + other.getQw() + ) + ) + return false; + if (hasDataSource() != other.hasDataSource()) + return false; if (hasDataSource()) { - if (dataSource_ != other.dataSource_) return false; + if (dataSource_ != other.dataSource_) + return false; } return unknownFields.equals(other.unknownFields); } @@ -1534,31 +1650,52 @@ public final class ProtobufMessages { hash = (53 * hash) + getTrackerId(); if (hasX()) { hash = (37 * hash) + X_FIELD_NUMBER; - hash = (53 * hash) + java.lang.Float.floatToIntBits( - getX()); + hash = (53 * hash) + + java.lang.Float + .floatToIntBits( + getX() + ); } if (hasY()) { hash = (37 * hash) + Y_FIELD_NUMBER; - hash = (53 * hash) + java.lang.Float.floatToIntBits( - getY()); + hash = (53 * hash) + + java.lang.Float + .floatToIntBits( + getY() + ); } if (hasZ()) { hash = (37 * hash) + Z_FIELD_NUMBER; - hash = (53 * hash) + java.lang.Float.floatToIntBits( - getZ()); + hash = (53 * hash) + + java.lang.Float + .floatToIntBits( + getZ() + ); } hash = (37 * hash) + QX_FIELD_NUMBER; - hash = (53 * hash) + java.lang.Float.floatToIntBits( - getQx()); + hash = (53 * hash) + + java.lang.Float + .floatToIntBits( + getQx() + ); hash = (37 * hash) + QY_FIELD_NUMBER; - hash = (53 * hash) + java.lang.Float.floatToIntBits( - getQy()); + hash = (53 * hash) + + java.lang.Float + .floatToIntBits( + getQy() + ); hash = (37 * hash) + QZ_FIELD_NUMBER; - hash = (53 * hash) + java.lang.Float.floatToIntBits( - getQz()); + hash = (53 * hash) + + java.lang.Float + .floatToIntBits( + getQz() + ); hash = (37 * hash) + QW_FIELD_NUMBER; - hash = (53 * hash) + java.lang.Float.floatToIntBits( - getQw()); + hash = (53 * hash) + + java.lang.Float + .floatToIntBits( + getQw() + ); if (hasDataSource()) { hash = (37 * hash) + DATA_SOURCE_FIELD_NUMBER; hash = (53 * hash) + dataSource_; @@ -1576,12 +1713,14 @@ public final class ProtobufMessages { @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE - ? new Builder() : new Builder().mergeFrom(this); + ? new Builder() + : new Builder().mergeFrom(this); } @java.lang.Override protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + com.google.protobuf.GeneratedMessageV3.BuilderParent parent + ) { Builder builder = new Builder(parent); return builder; } @@ -1600,7 +1739,7 @@ public final class ProtobufMessages { * Protobuf enum {@code messages.Position.DataSource} */ public enum DataSource - implements com.google.protobuf.ProtocolMessageEnum { + implements com.google.protobuf.ProtocolMessageEnum { /** * NONE = 0; */ @@ -1636,14 +1775,12 @@ public final class ProtobufMessages { * FULL = 3; */ public static final int FULL_VALUE = 3; - private static final com.google.protobuf.Internal.EnumLiteMap< - DataSource> internalValueMap = - new com.google.protobuf.Internal.EnumLiteMap() { - @Override - public DataSource findValueByNumber(int number) { - return DataSource.forNumber(number); - } - }; + private static final com.google.protobuf.Internal.EnumLiteMap internalValueMap = new com.google.protobuf.Internal.EnumLiteMap() { + @Override + public DataSource findValueByNumber(int number) { + return DataSource.forNumber(number); + } + }; private static final DataSource[] VALUES = values(); private final int value; @@ -1652,7 +1789,8 @@ public final class ProtobufMessages { } /** - * @param value The numeric wire value of the corresponding enum entry. + * @param value The numeric wire value of the corresponding enum + * entry. * @return The enum associated with the given numeric wire value. * @deprecated Use {@link #forNumber(int)} instead. */ @@ -1662,7 +1800,8 @@ public final class ProtobufMessages { } /** - * @param value The numeric wire value of the corresponding enum entry. + * @param value The numeric wire value of the corresponding enum + * entry. * @return The enum associated with the given numeric wire value. */ public static DataSource forNumber(int value) { @@ -1680,21 +1819,24 @@ public final class ProtobufMessages { } } - public static com.google.protobuf.Internal.EnumLiteMap - internalGetValueMap() { + public static com.google.protobuf.Internal.EnumLiteMap internalGetValueMap() { return internalValueMap; } - public static final com.google.protobuf.Descriptors.EnumDescriptor - getDescriptor() { - return dev.slimevr.bridge.ProtobufMessages.Position.getDescriptor().getEnumTypes().get(0); + public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { + return dev.slimevr.bridge.ProtobufMessages.Position + .getDescriptor() + .getEnumTypes() + .get(0); } public static DataSource valueOf( - com.google.protobuf.Descriptors.EnumValueDescriptor desc) { + com.google.protobuf.Descriptors.EnumValueDescriptor desc + ) { if (desc.getType() != getDescriptor()) { throw new java.lang.IllegalArgumentException( - "EnumValueDescriptor is not for this type."); + "EnumValueDescriptor is not for this type." + ); } if (desc.getIndex() == -1) { return UNRECOGNIZED; @@ -1706,24 +1848,24 @@ public final class ProtobufMessages { public final int getNumber() { if (this == UNRECOGNIZED) { throw new java.lang.IllegalArgumentException( - "Can't get the number of an unknown enum value."); + "Can't get the number of an unknown enum value." + ); } return value; } @Override - public final com.google.protobuf.Descriptors.EnumValueDescriptor - getValueDescriptor() { + public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() { if (this == UNRECOGNIZED) { throw new java.lang.IllegalStateException( - "Can't get the descriptor of an unrecognized enum value."); + "Can't get the descriptor of an unrecognized enum value." + ); } return getDescriptor().getValues().get(ordinal()); } @Override - public final com.google.protobuf.Descriptors.EnumDescriptor - getDescriptorForType() { + public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() { return getDescriptor(); } @@ -1734,9 +1876,9 @@ public final class ProtobufMessages { * Protobuf type {@code messages.Position} */ public static final class Builder extends - com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:messages.Position) - dev.slimevr.bridge.ProtobufMessages.PositionOrBuilder { + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:messages.Position) + dev.slimevr.bridge.ProtobufMessages.PositionOrBuilder { private int bitField0_; private int trackerId_; private float x_; @@ -1748,34 +1890,34 @@ public final class ProtobufMessages { private float qw_; private int dataSource_ = 0; - // Construct using dev.slimevr.bridge.ProtobufMessages.Position.newBuilder() + // Construct using + // dev.slimevr.bridge.ProtobufMessages.Position.newBuilder() private Builder() { maybeForceBuilderInitialization(); } private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + com.google.protobuf.GeneratedMessageV3.BuilderParent parent + ) { super(parent); maybeForceBuilderInitialization(); } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return dev.slimevr.bridge.ProtobufMessages.internal_static_messages_Position_descriptor; } @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return dev.slimevr.bridge.ProtobufMessages.internal_static_messages_Position_fieldAccessorTable - .ensureFieldAccessorsInitialized( - dev.slimevr.bridge.ProtobufMessages.Position.class, dev.slimevr.bridge.ProtobufMessages.Position.Builder.class); + .ensureFieldAccessorsInitialized( + dev.slimevr.bridge.ProtobufMessages.Position.class, + dev.slimevr.bridge.ProtobufMessages.Position.Builder.class + ); } private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } + if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -1803,8 +1945,7 @@ public final class ProtobufMessages { } @java.lang.Override - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return dev.slimevr.bridge.ProtobufMessages.internal_static_messages_Position_descriptor; } @@ -1824,7 +1965,9 @@ public final class ProtobufMessages { @java.lang.Override public dev.slimevr.bridge.ProtobufMessages.Position buildPartial() { - dev.slimevr.bridge.ProtobufMessages.Position result = new dev.slimevr.bridge.ProtobufMessages.Position(this); + dev.slimevr.bridge.ProtobufMessages.Position result = new dev.slimevr.bridge.ProtobufMessages.Position( + this + ); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; result.trackerId_ = trackerId_; @@ -1860,34 +2003,40 @@ public final class ProtobufMessages { @java.lang.Override public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value + ) { return super.setField(field, value); } @java.lang.Override public Builder clearField( - com.google.protobuf.Descriptors.FieldDescriptor field) { + com.google.protobuf.Descriptors.FieldDescriptor field + ) { return super.clearField(field); } @java.lang.Override public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { + com.google.protobuf.Descriptors.OneofDescriptor oneof + ) { return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, + java.lang.Object value + ) { return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value + ) { return super.addRepeatedField(field, value); } @@ -1902,7 +2051,8 @@ public final class ProtobufMessages { } public Builder mergeFrom(dev.slimevr.bridge.ProtobufMessages.Position other) { - if (other == dev.slimevr.bridge.ProtobufMessages.Position.getDefaultInstance()) return this; + if (other == dev.slimevr.bridge.ProtobufMessages.Position.getDefaultInstance()) + return this; if (other.getTrackerId() != 0) { setTrackerId(other.getTrackerId()); } @@ -1942,14 +2092,16 @@ public final class ProtobufMessages { @java.lang.Override public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws java.io.IOException { dev.slimevr.bridge.ProtobufMessages.Position parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (dev.slimevr.bridge.ProtobufMessages.Position) e.getUnfinishedMessage(); + parsedMessage = (dev.slimevr.bridge.ProtobufMessages.Position) e + .getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -2292,7 +2444,8 @@ public final class ProtobufMessages { /** * .messages.Position.DataSource data_source = 9; * - * @param value The enum numeric value on the wire for dataSource to set. + * @param value The enum numeric value on the wire for dataSource to + * set. * @return This builder for chaining. */ public Builder setDataSourceValue(int value) { @@ -2310,8 +2463,11 @@ public final class ProtobufMessages { @java.lang.Override public dev.slimevr.bridge.ProtobufMessages.Position.DataSource getDataSource() { @SuppressWarnings("deprecation") - dev.slimevr.bridge.ProtobufMessages.Position.DataSource result = dev.slimevr.bridge.ProtobufMessages.Position.DataSource.valueOf(dataSource_); - return result == null ? dev.slimevr.bridge.ProtobufMessages.Position.DataSource.UNRECOGNIZED : result; + dev.slimevr.bridge.ProtobufMessages.Position.DataSource result = dev.slimevr.bridge.ProtobufMessages.Position.DataSource + .valueOf(dataSource_); + return result == null + ? dev.slimevr.bridge.ProtobufMessages.Position.DataSource.UNRECOGNIZED + : result; } /** @@ -2320,7 +2476,9 @@ public final class ProtobufMessages { * @param value The dataSource to set. * @return This builder for chaining. */ - public Builder setDataSource(dev.slimevr.bridge.ProtobufMessages.Position.DataSource value) { + public Builder setDataSource( + dev.slimevr.bridge.ProtobufMessages.Position.DataSource value + ) { if (value == null) { throw new NullPointerException(); } @@ -2344,13 +2502,15 @@ public final class ProtobufMessages { @java.lang.Override public final Builder setUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { + final com.google.protobuf.UnknownFieldSet unknownFields + ) { return super.setUnknownFields(unknownFields); } @java.lang.Override public final Builder mergeUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { + final com.google.protobuf.UnknownFieldSet unknownFields + ) { return super.mergeUnknownFields(unknownFields); } @@ -2362,21 +2522,21 @@ public final class ProtobufMessages { * Protobuf type {@code messages.UserAction} */ public static final class UserAction extends - com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:messages.UserAction) - UserActionOrBuilder { + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:messages.UserAction) + UserActionOrBuilder { public static final int NAME_FIELD_NUMBER = 1; public static final int ACTION_ARGUMENTS_FIELD_NUMBER = 2; private static final long serialVersionUID = 0L; // @@protoc_insertion_point(class_scope:messages.UserAction) private static final dev.slimevr.bridge.ProtobufMessages.UserAction DEFAULT_INSTANCE; - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { + private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { @java.lang.Override public UserAction parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws com.google.protobuf.InvalidProtocolBufferException { return new UserAction(input, extensionRegistry); } }; @@ -2386,8 +2546,7 @@ public final class ProtobufMessages { } private volatile java.lang.Object name_; - private com.google.protobuf.MapField< - java.lang.String, java.lang.String> actionArguments_; + private com.google.protobuf.MapField actionArguments_; private byte memoizedIsInitialized = -1; // Use UserAction.newBuilder() to construct. @@ -2400,16 +2559,17 @@ public final class ProtobufMessages { } private UserAction( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws com.google.protobuf.InvalidProtocolBufferException { this(); if (extensionRegistry == null) { throw new java.lang.NullPointerException(); } int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); + com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet + .newBuilder(); try { boolean done = false; while (!done) { @@ -2426,20 +2586,35 @@ public final class ProtobufMessages { } case 18: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { - actionArguments_ = com.google.protobuf.MapField.newMapField( - ActionArgumentsDefaultEntryHolder.defaultEntry); + actionArguments_ = com.google.protobuf.MapField + .newMapField( + ActionArgumentsDefaultEntryHolder.defaultEntry + ); mutable_bitField0_ |= 0x00000001; } - com.google.protobuf.MapEntry - actionArguments__ = input.readMessage( - ActionArgumentsDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry); - actionArguments_.getMutableMap().put( - actionArguments__.getKey(), actionArguments__.getValue()); + com.google.protobuf.MapEntry actionArguments__ = input + .readMessage( + ActionArgumentsDefaultEntryHolder.defaultEntry + .getParserForType(), + extensionRegistry + ); + actionArguments_ + .getMutableMap() + .put( + actionArguments__.getKey(), + actionArguments__.getValue() + ); break; } default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { + if ( + !parseUnknownField( + input, + unknownFields, + extensionRegistry, + tag + ) + ) { done = true; } break; @@ -2450,97 +2625,110 @@ public final class ProtobufMessages { throw e.setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); + e + ).setUnfinishedMessage(this); } finally { this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return dev.slimevr.bridge.ProtobufMessages.internal_static_messages_UserAction_descriptor; } public static dev.slimevr.bridge.ProtobufMessages.UserAction parseFrom( - java.nio.ByteBuffer data) - throws com.google.protobuf.InvalidProtocolBufferException { + java.nio.ByteBuffer data + ) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } public static dev.slimevr.bridge.ProtobufMessages.UserAction parseFrom( - java.nio.ByteBuffer data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } public static dev.slimevr.bridge.ProtobufMessages.UserAction parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { + com.google.protobuf.ByteString data + ) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } public static dev.slimevr.bridge.ProtobufMessages.UserAction parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } public static dev.slimevr.bridge.ProtobufMessages.UserAction parseFrom(byte[] data) - throws com.google.protobuf.InvalidProtocolBufferException { + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } public static dev.slimevr.bridge.ProtobufMessages.UserAction parseFrom( - byte[] data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static dev.slimevr.bridge.ProtobufMessages.UserAction parseFrom(java.io.InputStream input) - throws java.io.IOException { + public static dev.slimevr.bridge.ProtobufMessages.UserAction parseFrom( + java.io.InputStream input + ) + throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input); + .parseWithIOException(PARSER, input); } public static dev.slimevr.bridge.ProtobufMessages.UserAction parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input, extensionRegistry); - } - - public static dev.slimevr.bridge.ProtobufMessages.UserAction parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseDelimitedWithIOException(PARSER, input); + .parseWithIOException(PARSER, input, extensionRegistry); } public static dev.slimevr.bridge.ProtobufMessages.UserAction parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { + java.io.InputStream input + ) + throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 - .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + .parseDelimitedWithIOException(PARSER, input); + } + + public static dev.slimevr.bridge.ProtobufMessages.UserAction parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } public static dev.slimevr.bridge.ProtobufMessages.UserAction parseFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { + com.google.protobuf.CodedInputStream input + ) + throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input); + .parseWithIOException(PARSER, input); } public static dev.slimevr.bridge.ProtobufMessages.UserAction parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input, extensionRegistry); + .parseWithIOException(PARSER, input, extensionRegistry); } public static Builder newBuilder() { @@ -2560,37 +2748,40 @@ public final class ProtobufMessages { } @java.lang.Override - @SuppressWarnings({"unused"}) + @SuppressWarnings({ "unused" }) protected java.lang.Object newInstance( - UnusedPrivateParameter unused) { + UnusedPrivateParameter unused + ) { return new UserAction(); } @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { + public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - @SuppressWarnings({"rawtypes"}) + @SuppressWarnings({ "rawtypes" }) @java.lang.Override protected com.google.protobuf.MapField internalGetMapField( - int number) { + int number + ) { switch (number) { case 2: return internalGetActionArguments(); default: throw new RuntimeException( - "Invalid map field number: " + number); + "Invalid map field number: " + number + ); } } @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return dev.slimevr.bridge.ProtobufMessages.internal_static_messages_UserAction_fieldAccessorTable - .ensureFieldAccessorsInitialized( - dev.slimevr.bridge.ProtobufMessages.UserAction.class, dev.slimevr.bridge.ProtobufMessages.UserAction.Builder.class); + .ensureFieldAccessorsInitialized( + dev.slimevr.bridge.ProtobufMessages.UserAction.class, + dev.slimevr.bridge.ProtobufMessages.UserAction.Builder.class + ); } /** @@ -2604,8 +2795,7 @@ public final class ProtobufMessages { if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); name_ = s; return s; @@ -2618,13 +2808,13 @@ public final class ProtobufMessages { * @return The bytes for name. */ @java.lang.Override - public com.google.protobuf.ByteString - getNameBytes() { + public com.google.protobuf.ByteString getNameBytes() { java.lang.Object ref = name_; if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + com.google.protobuf.ByteString b = com.google.protobuf.ByteString + .copyFromUtf8( + (java.lang.String) ref + ); name_ = b; return b; } else { @@ -2632,11 +2822,12 @@ public final class ProtobufMessages { } } - private com.google.protobuf.MapField - internalGetActionArguments() { + private com.google.protobuf.MapField internalGetActionArguments() { if (actionArguments_ == null) { - return com.google.protobuf.MapField.emptyMapField( - ActionArgumentsDefaultEntryHolder.defaultEntry); + return com.google.protobuf.MapField + .emptyMapField( + ActionArgumentsDefaultEntryHolder.defaultEntry + ); } return actionArguments_; } @@ -2652,7 +2843,8 @@ public final class ProtobufMessages { @java.lang.Override public boolean containsActionArguments( - java.lang.String key) { + java.lang.String key + ) { if (key == null) { throw new java.lang.NullPointerException(); } @@ -2683,13 +2875,14 @@ public final class ProtobufMessages { @java.lang.Override public java.lang.String getActionArgumentsOrDefault( - java.lang.String key, - java.lang.String defaultValue) { + java.lang.String key, + java.lang.String defaultValue + ) { if (key == null) { throw new java.lang.NullPointerException(); } - java.util.Map map = - internalGetActionArguments().getMap(); + java.util.Map map = internalGetActionArguments() + .getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; } @@ -2699,12 +2892,13 @@ public final class ProtobufMessages { @java.lang.Override public java.lang.String getActionArgumentsOrThrow( - java.lang.String key) { + java.lang.String key + ) { if (key == null) { throw new java.lang.NullPointerException(); } - java.util.Map map = - internalGetActionArguments().getMap(); + java.util.Map map = internalGetActionArguments() + .getMap(); if (!map.containsKey(key)) { throw new java.lang.IllegalArgumentException(); } @@ -2714,8 +2908,10 @@ public final class ProtobufMessages { @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; - if (isInitialized == 1) return true; - if (isInitialized == 0) return false; + if (isInitialized == 1) + return true; + if (isInitialized == 0) + return false; memoizedIsInitialized = 1; return true; @@ -2723,37 +2919,42 @@ public final class ProtobufMessages { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { + throws java.io.IOException { if (!getNameBytes().isEmpty()) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_); } com.google.protobuf.GeneratedMessageV3 - .serializeStringMapTo( - output, - internalGetActionArguments(), - ActionArgumentsDefaultEntryHolder.defaultEntry, - 2); + .serializeStringMapTo( + output, + internalGetActionArguments(), + ActionArgumentsDefaultEntryHolder.defaultEntry, + 2 + ); unknownFields.writeTo(output); } @java.lang.Override public int getSerializedSize() { int size = memoizedSize; - if (size != -1) return size; + if (size != -1) + return size; size = 0; if (!getNameBytes().isEmpty()) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_); } - for (java.util.Map.Entry entry - : internalGetActionArguments().getMap().entrySet()) { - com.google.protobuf.MapEntry - actionArguments__ = ActionArgumentsDefaultEntryHolder.defaultEntry.newBuilderForType() - .setKey(entry.getKey()) - .setValue(entry.getValue()) - .build(); + for ( + java.util.Map.Entry entry : internalGetActionArguments() + .getMap() + .entrySet() + ) { + com.google.protobuf.MapEntry actionArguments__ = ActionArgumentsDefaultEntryHolder.defaultEntry + .newBuilderForType() + .setKey(entry.getKey()) + .setValue(entry.getValue()) + .build(); size += com.google.protobuf.CodedOutputStream - .computeMessageSize(2, actionArguments__); + .computeMessageSize(2, actionArguments__); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -2770,10 +2971,18 @@ public final class ProtobufMessages { } dev.slimevr.bridge.ProtobufMessages.UserAction other = (dev.slimevr.bridge.ProtobufMessages.UserAction) obj; - if (!getName() - .equals(other.getName())) return false; - if (!internalGetActionArguments().equals( - other.internalGetActionArguments())) return false; + if ( + !getName() + .equals(other.getName()) + ) + return false; + if ( + !internalGetActionArguments() + .equals( + other.internalGetActionArguments() + ) + ) + return false; return unknownFields.equals(other.unknownFields); } @@ -2803,12 +3012,14 @@ public final class ProtobufMessages { @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE - ? new Builder() : new Builder().mergeFrom(this); + ? new Builder() + : new Builder().mergeFrom(this); } @java.lang.Override protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + com.google.protobuf.GeneratedMessageV3.BuilderParent parent + ) { Builder builder = new Builder(parent); return builder; } @@ -2824,83 +3035,85 @@ public final class ProtobufMessages { } private static final class ActionArgumentsDefaultEntryHolder { - static final com.google.protobuf.MapEntry< - java.lang.String, java.lang.String> defaultEntry = - com.google.protobuf.MapEntry - .newDefaultInstance( - dev.slimevr.bridge.ProtobufMessages.internal_static_messages_UserAction_ActionArgumentsEntry_descriptor, - com.google.protobuf.WireFormat.FieldType.STRING, - "", - com.google.protobuf.WireFormat.FieldType.STRING, - ""); + static final com.google.protobuf.MapEntry defaultEntry = com.google.protobuf.MapEntry + .newDefaultInstance( + dev.slimevr.bridge.ProtobufMessages.internal_static_messages_UserAction_ActionArgumentsEntry_descriptor, + com.google.protobuf.WireFormat.FieldType.STRING, + "", + com.google.protobuf.WireFormat.FieldType.STRING, + "" + ); } /** * Protobuf type {@code messages.UserAction} */ public static final class Builder extends - com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:messages.UserAction) - dev.slimevr.bridge.ProtobufMessages.UserActionOrBuilder { + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:messages.UserAction) + dev.slimevr.bridge.ProtobufMessages.UserActionOrBuilder { private int bitField0_; private java.lang.Object name_ = ""; - private com.google.protobuf.MapField< - java.lang.String, java.lang.String> actionArguments_; + private com.google.protobuf.MapField actionArguments_; - // Construct using dev.slimevr.bridge.ProtobufMessages.UserAction.newBuilder() + // Construct using + // dev.slimevr.bridge.ProtobufMessages.UserAction.newBuilder() private Builder() { maybeForceBuilderInitialization(); } private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + com.google.protobuf.GeneratedMessageV3.BuilderParent parent + ) { super(parent); maybeForceBuilderInitialization(); } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return dev.slimevr.bridge.ProtobufMessages.internal_static_messages_UserAction_descriptor; } @Override - @SuppressWarnings({"rawtypes"}) + @SuppressWarnings({ "rawtypes" }) protected com.google.protobuf.MapField internalGetMapField( - int number) { + int number + ) { switch (number) { case 2: return internalGetActionArguments(); default: throw new RuntimeException( - "Invalid map field number: " + number); + "Invalid map field number: " + number + ); } } @Override - @SuppressWarnings({"rawtypes"}) + @SuppressWarnings({ "rawtypes" }) protected com.google.protobuf.MapField internalGetMutableMapField( - int number) { + int number + ) { switch (number) { case 2: return internalGetMutableActionArguments(); default: throw new RuntimeException( - "Invalid map field number: " + number); + "Invalid map field number: " + number + ); } } @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return dev.slimevr.bridge.ProtobufMessages.internal_static_messages_UserAction_fieldAccessorTable - .ensureFieldAccessorsInitialized( - dev.slimevr.bridge.ProtobufMessages.UserAction.class, dev.slimevr.bridge.ProtobufMessages.UserAction.Builder.class); + .ensureFieldAccessorsInitialized( + dev.slimevr.bridge.ProtobufMessages.UserAction.class, + dev.slimevr.bridge.ProtobufMessages.UserAction.Builder.class + ); } private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } + if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -2913,8 +3126,7 @@ public final class ProtobufMessages { } @java.lang.Override - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return dev.slimevr.bridge.ProtobufMessages.internal_static_messages_UserAction_descriptor; } @@ -2934,7 +3146,9 @@ public final class ProtobufMessages { @java.lang.Override public dev.slimevr.bridge.ProtobufMessages.UserAction buildPartial() { - dev.slimevr.bridge.ProtobufMessages.UserAction result = new dev.slimevr.bridge.ProtobufMessages.UserAction(this); + dev.slimevr.bridge.ProtobufMessages.UserAction result = new dev.slimevr.bridge.ProtobufMessages.UserAction( + this + ); int from_bitField0_ = bitField0_; result.name_ = name_; result.actionArguments_ = internalGetActionArguments(); @@ -2950,34 +3164,40 @@ public final class ProtobufMessages { @java.lang.Override public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value + ) { return super.setField(field, value); } @java.lang.Override public Builder clearField( - com.google.protobuf.Descriptors.FieldDescriptor field) { + com.google.protobuf.Descriptors.FieldDescriptor field + ) { return super.clearField(field); } @java.lang.Override public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { + com.google.protobuf.Descriptors.OneofDescriptor oneof + ) { return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, + java.lang.Object value + ) { return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value + ) { return super.addRepeatedField(field, value); } @@ -2992,13 +3212,16 @@ public final class ProtobufMessages { } public Builder mergeFrom(dev.slimevr.bridge.ProtobufMessages.UserAction other) { - if (other == dev.slimevr.bridge.ProtobufMessages.UserAction.getDefaultInstance()) return this; + if (other == dev.slimevr.bridge.ProtobufMessages.UserAction.getDefaultInstance()) + return this; if (!other.getName().isEmpty()) { name_ = other.name_; onChanged(); } - internalGetMutableActionArguments().mergeFrom( - other.internalGetActionArguments()); + internalGetMutableActionArguments() + .mergeFrom( + other.internalGetActionArguments() + ); this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -3011,14 +3234,16 @@ public final class ProtobufMessages { @java.lang.Override public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws java.io.IOException { dev.slimevr.bridge.ProtobufMessages.UserAction parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (dev.slimevr.bridge.ProtobufMessages.UserAction) e.getUnfinishedMessage(); + parsedMessage = (dev.slimevr.bridge.ProtobufMessages.UserAction) e + .getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -3037,8 +3262,7 @@ public final class ProtobufMessages { public java.lang.String getName() { java.lang.Object ref = name_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); name_ = s; return s; @@ -3054,7 +3278,8 @@ public final class ProtobufMessages { * @return This builder for chaining. */ public Builder setName( - java.lang.String value) { + java.lang.String value + ) { if (value == null) { throw new NullPointerException(); } @@ -3070,13 +3295,13 @@ public final class ProtobufMessages { * @return The bytes for name. */ @Override - public com.google.protobuf.ByteString - getNameBytes() { + public com.google.protobuf.ByteString getNameBytes() { java.lang.Object ref = name_; if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + com.google.protobuf.ByteString b = com.google.protobuf.ByteString + .copyFromUtf8( + (java.lang.String) ref + ); name_ = b; return b; } else { @@ -3091,7 +3316,8 @@ public final class ProtobufMessages { * @return This builder for chaining. */ public Builder setNameBytes( - com.google.protobuf.ByteString value) { + com.google.protobuf.ByteString value + ) { if (value == null) { throw new NullPointerException(); } @@ -3114,21 +3340,23 @@ public final class ProtobufMessages { return this; } - private com.google.protobuf.MapField - internalGetActionArguments() { + private com.google.protobuf.MapField internalGetActionArguments() { if (actionArguments_ == null) { - return com.google.protobuf.MapField.emptyMapField( - ActionArgumentsDefaultEntryHolder.defaultEntry); + return com.google.protobuf.MapField + .emptyMapField( + ActionArgumentsDefaultEntryHolder.defaultEntry + ); } return actionArguments_; } - private com.google.protobuf.MapField - internalGetMutableActionArguments() { + private com.google.protobuf.MapField internalGetMutableActionArguments() { onChanged(); if (actionArguments_ == null) { - actionArguments_ = com.google.protobuf.MapField.newMapField( - ActionArgumentsDefaultEntryHolder.defaultEntry); + actionArguments_ = com.google.protobuf.MapField + .newMapField( + ActionArgumentsDefaultEntryHolder.defaultEntry + ); } if (!actionArguments_.isMutable()) { actionArguments_ = actionArguments_.copy(); @@ -3147,7 +3375,8 @@ public final class ProtobufMessages { @java.lang.Override public boolean containsActionArguments( - java.lang.String key) { + java.lang.String key + ) { if (key == null) { throw new java.lang.NullPointerException(); } @@ -3178,13 +3407,14 @@ public final class ProtobufMessages { @java.lang.Override public java.lang.String getActionArgumentsOrDefault( - java.lang.String key, - java.lang.String defaultValue) { + java.lang.String key, + java.lang.String defaultValue + ) { if (key == null) { throw new java.lang.NullPointerException(); } - java.util.Map map = - internalGetActionArguments().getMap(); + java.util.Map map = internalGetActionArguments() + .getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; } @@ -3194,12 +3424,13 @@ public final class ProtobufMessages { @java.lang.Override public java.lang.String getActionArgumentsOrThrow( - java.lang.String key) { + java.lang.String key + ) { if (key == null) { throw new java.lang.NullPointerException(); } - java.util.Map map = - internalGetActionArguments().getMap(); + java.util.Map map = internalGetActionArguments() + .getMap(); if (!map.containsKey(key)) { throw new java.lang.IllegalArgumentException(); } @@ -3207,8 +3438,9 @@ public final class ProtobufMessages { } public Builder clearActionArguments() { - internalGetMutableActionArguments().getMutableMap() - .clear(); + internalGetMutableActionArguments() + .getMutableMap() + .clear(); return this; } @@ -3217,12 +3449,14 @@ public final class ProtobufMessages { */ public Builder removeActionArguments( - java.lang.String key) { + java.lang.String key + ) { if (key == null) { throw new java.lang.NullPointerException(); } - internalGetMutableActionArguments().getMutableMap() - .remove(key); + internalGetMutableActionArguments() + .getMutableMap() + .remove(key); return this; } @@ -3230,8 +3464,7 @@ public final class ProtobufMessages { * Use alternate mutation accessors instead. */ @java.lang.Deprecated - public java.util.Map - getMutableActionArguments() { + public java.util.Map getMutableActionArguments() { return internalGetMutableActionArguments().getMutableMap(); } @@ -3239,16 +3472,18 @@ public final class ProtobufMessages { * map<string, string> action_arguments = 2; */ public Builder putActionArguments( - java.lang.String key, - java.lang.String value) { + java.lang.String key, + java.lang.String value + ) { if (key == null) { throw new java.lang.NullPointerException(); } if (value == null) { throw new java.lang.NullPointerException(); } - internalGetMutableActionArguments().getMutableMap() - .put(key, value); + internalGetMutableActionArguments() + .getMutableMap() + .put(key, value); return this; } @@ -3257,21 +3492,25 @@ public final class ProtobufMessages { */ public Builder putAllActionArguments( - java.util.Map values) { - internalGetMutableActionArguments().getMutableMap() - .putAll(values); + java.util.Map values + ) { + internalGetMutableActionArguments() + .getMutableMap() + .putAll(values); return this; } @java.lang.Override public final Builder setUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { + final com.google.protobuf.UnknownFieldSet unknownFields + ) { return super.setUnknownFields(unknownFields); } @java.lang.Override public final Builder mergeUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { + final com.google.protobuf.UnknownFieldSet unknownFields + ) { return super.mergeUnknownFields(unknownFields); } @@ -3283,9 +3522,9 @@ public final class ProtobufMessages { * Protobuf type {@code messages.TrackerAdded} */ public static final class TrackerAdded extends - com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:messages.TrackerAdded) - TrackerAddedOrBuilder { + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:messages.TrackerAdded) + TrackerAddedOrBuilder { public static final int TRACKER_ID_FIELD_NUMBER = 1; public static final int TRACKER_SERIAL_FIELD_NUMBER = 2; public static final int TRACKER_NAME_FIELD_NUMBER = 3; @@ -3293,13 +3532,13 @@ public final class ProtobufMessages { private static final long serialVersionUID = 0L; // @@protoc_insertion_point(class_scope:messages.TrackerAdded) private static final dev.slimevr.bridge.ProtobufMessages.TrackerAdded DEFAULT_INSTANCE; - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { + private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { @java.lang.Override public TrackerAdded parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws com.google.protobuf.InvalidProtocolBufferException { return new TrackerAdded(input, extensionRegistry); } }; @@ -3325,15 +3564,16 @@ public final class ProtobufMessages { } private TrackerAdded( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws com.google.protobuf.InvalidProtocolBufferException { this(); if (extensionRegistry == null) { throw new java.lang.NullPointerException(); } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); + com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet + .newBuilder(); try { boolean done = false; while (!done) { @@ -3365,8 +3605,14 @@ public final class ProtobufMessages { break; } default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { + if ( + !parseUnknownField( + input, + unknownFields, + extensionRegistry, + tag + ) + ) { done = true; } break; @@ -3377,104 +3623,119 @@ public final class ProtobufMessages { throw e.setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); + e + ).setUnfinishedMessage(this); } finally { this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return dev.slimevr.bridge.ProtobufMessages.internal_static_messages_TrackerAdded_descriptor; } public static dev.slimevr.bridge.ProtobufMessages.TrackerAdded parseFrom( - java.nio.ByteBuffer data) - throws com.google.protobuf.InvalidProtocolBufferException { + java.nio.ByteBuffer data + ) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } public static dev.slimevr.bridge.ProtobufMessages.TrackerAdded parseFrom( - java.nio.ByteBuffer data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } public static dev.slimevr.bridge.ProtobufMessages.TrackerAdded parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { + com.google.protobuf.ByteString data + ) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } public static dev.slimevr.bridge.ProtobufMessages.TrackerAdded parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } public static dev.slimevr.bridge.ProtobufMessages.TrackerAdded parseFrom(byte[] data) - throws com.google.protobuf.InvalidProtocolBufferException { + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } public static dev.slimevr.bridge.ProtobufMessages.TrackerAdded parseFrom( - byte[] data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static dev.slimevr.bridge.ProtobufMessages.TrackerAdded parseFrom(java.io.InputStream input) - throws java.io.IOException { + public static dev.slimevr.bridge.ProtobufMessages.TrackerAdded parseFrom( + java.io.InputStream input + ) + throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input); + .parseWithIOException(PARSER, input); } public static dev.slimevr.bridge.ProtobufMessages.TrackerAdded parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input, extensionRegistry); - } - - public static dev.slimevr.bridge.ProtobufMessages.TrackerAdded parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseDelimitedWithIOException(PARSER, input); + .parseWithIOException(PARSER, input, extensionRegistry); } public static dev.slimevr.bridge.ProtobufMessages.TrackerAdded parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { + java.io.InputStream input + ) + throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 - .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + .parseDelimitedWithIOException(PARSER, input); + } + + public static dev.slimevr.bridge.ProtobufMessages.TrackerAdded parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } public static dev.slimevr.bridge.ProtobufMessages.TrackerAdded parseFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { + com.google.protobuf.CodedInputStream input + ) + throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input); + .parseWithIOException(PARSER, input); } public static dev.slimevr.bridge.ProtobufMessages.TrackerAdded parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input, extensionRegistry); + .parseWithIOException(PARSER, input, extensionRegistry); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(dev.slimevr.bridge.ProtobufMessages.TrackerAdded prototype) { + public static Builder newBuilder( + dev.slimevr.bridge.ProtobufMessages.TrackerAdded prototype + ) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @@ -3487,24 +3748,25 @@ public final class ProtobufMessages { } @java.lang.Override - @SuppressWarnings({"unused"}) + @SuppressWarnings({ "unused" }) protected java.lang.Object newInstance( - UnusedPrivateParameter unused) { + UnusedPrivateParameter unused + ) { return new TrackerAdded(); } @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { + public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return dev.slimevr.bridge.ProtobufMessages.internal_static_messages_TrackerAdded_fieldAccessorTable - .ensureFieldAccessorsInitialized( - dev.slimevr.bridge.ProtobufMessages.TrackerAdded.class, dev.slimevr.bridge.ProtobufMessages.TrackerAdded.Builder.class); + .ensureFieldAccessorsInitialized( + dev.slimevr.bridge.ProtobufMessages.TrackerAdded.class, + dev.slimevr.bridge.ProtobufMessages.TrackerAdded.Builder.class + ); } /** @@ -3528,8 +3790,7 @@ public final class ProtobufMessages { if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); trackerSerial_ = s; return s; @@ -3542,13 +3803,13 @@ public final class ProtobufMessages { * @return The bytes for trackerSerial. */ @java.lang.Override - public com.google.protobuf.ByteString - getTrackerSerialBytes() { + public com.google.protobuf.ByteString getTrackerSerialBytes() { java.lang.Object ref = trackerSerial_; if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + com.google.protobuf.ByteString b = com.google.protobuf.ByteString + .copyFromUtf8( + (java.lang.String) ref + ); trackerSerial_ = b; return b; } else { @@ -3567,8 +3828,7 @@ public final class ProtobufMessages { if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); trackerName_ = s; return s; @@ -3581,13 +3841,13 @@ public final class ProtobufMessages { * @return The bytes for trackerName. */ @java.lang.Override - public com.google.protobuf.ByteString - getTrackerNameBytes() { + public com.google.protobuf.ByteString getTrackerNameBytes() { java.lang.Object ref = trackerName_; if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + com.google.protobuf.ByteString b = com.google.protobuf.ByteString + .copyFromUtf8( + (java.lang.String) ref + ); trackerName_ = b; return b; } else { @@ -3608,8 +3868,10 @@ public final class ProtobufMessages { @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; - if (isInitialized == 1) return true; - if (isInitialized == 0) return false; + if (isInitialized == 1) + return true; + if (isInitialized == 0) + return false; memoizedIsInitialized = 1; return true; @@ -3617,7 +3879,7 @@ public final class ProtobufMessages { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { + throws java.io.IOException { if (trackerId_ != 0) { output.writeInt32(1, trackerId_); } @@ -3636,12 +3898,13 @@ public final class ProtobufMessages { @java.lang.Override public int getSerializedSize() { int size = memoizedSize; - if (size != -1) return size; + if (size != -1) + return size; size = 0; if (trackerId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(1, trackerId_); + .computeInt32Size(1, trackerId_); } if (!getTrackerSerialBytes().isEmpty()) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, trackerSerial_); @@ -3651,7 +3914,7 @@ public final class ProtobufMessages { } if (trackerRole_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(4, trackerRole_); + .computeInt32Size(4, trackerRole_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -3668,14 +3931,20 @@ public final class ProtobufMessages { } dev.slimevr.bridge.ProtobufMessages.TrackerAdded other = (dev.slimevr.bridge.ProtobufMessages.TrackerAdded) obj; - if (getTrackerId() - != other.getTrackerId()) return false; - if (!getTrackerSerial() - .equals(other.getTrackerSerial())) return false; - if (!getTrackerName() - .equals(other.getTrackerName())) return false; - if (getTrackerRole() - != other.getTrackerRole()) return false; + if (getTrackerId() != other.getTrackerId()) + return false; + if ( + !getTrackerSerial() + .equals(other.getTrackerSerial()) + ) + return false; + if ( + !getTrackerName() + .equals(other.getTrackerName()) + ) + return false; + if (getTrackerRole() != other.getTrackerRole()) + return false; return unknownFields.equals(other.unknownFields); } @@ -3707,12 +3976,14 @@ public final class ProtobufMessages { @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE - ? new Builder() : new Builder().mergeFrom(this); + ? new Builder() + : new Builder().mergeFrom(this); } @java.lang.Override protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + com.google.protobuf.GeneratedMessageV3.BuilderParent parent + ) { Builder builder = new Builder(parent); return builder; } @@ -3731,42 +4002,42 @@ public final class ProtobufMessages { * Protobuf type {@code messages.TrackerAdded} */ public static final class Builder extends - com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:messages.TrackerAdded) - dev.slimevr.bridge.ProtobufMessages.TrackerAddedOrBuilder { + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:messages.TrackerAdded) + dev.slimevr.bridge.ProtobufMessages.TrackerAddedOrBuilder { private int trackerId_; private java.lang.Object trackerSerial_ = ""; private java.lang.Object trackerName_ = ""; private int trackerRole_; - // Construct using dev.slimevr.bridge.ProtobufMessages.TrackerAdded.newBuilder() + // Construct using + // dev.slimevr.bridge.ProtobufMessages.TrackerAdded.newBuilder() private Builder() { maybeForceBuilderInitialization(); } private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + com.google.protobuf.GeneratedMessageV3.BuilderParent parent + ) { super(parent); maybeForceBuilderInitialization(); } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return dev.slimevr.bridge.ProtobufMessages.internal_static_messages_TrackerAdded_descriptor; } @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return dev.slimevr.bridge.ProtobufMessages.internal_static_messages_TrackerAdded_fieldAccessorTable - .ensureFieldAccessorsInitialized( - dev.slimevr.bridge.ProtobufMessages.TrackerAdded.class, dev.slimevr.bridge.ProtobufMessages.TrackerAdded.Builder.class); + .ensureFieldAccessorsInitialized( + dev.slimevr.bridge.ProtobufMessages.TrackerAdded.class, + dev.slimevr.bridge.ProtobufMessages.TrackerAdded.Builder.class + ); } private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } + if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -3784,8 +4055,7 @@ public final class ProtobufMessages { } @java.lang.Override - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return dev.slimevr.bridge.ProtobufMessages.internal_static_messages_TrackerAdded_descriptor; } @@ -3805,7 +4075,9 @@ public final class ProtobufMessages { @java.lang.Override public dev.slimevr.bridge.ProtobufMessages.TrackerAdded buildPartial() { - dev.slimevr.bridge.ProtobufMessages.TrackerAdded result = new dev.slimevr.bridge.ProtobufMessages.TrackerAdded(this); + dev.slimevr.bridge.ProtobufMessages.TrackerAdded result = new dev.slimevr.bridge.ProtobufMessages.TrackerAdded( + this + ); result.trackerId_ = trackerId_; result.trackerSerial_ = trackerSerial_; result.trackerName_ = trackerName_; @@ -3821,34 +4093,40 @@ public final class ProtobufMessages { @java.lang.Override public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value + ) { return super.setField(field, value); } @java.lang.Override public Builder clearField( - com.google.protobuf.Descriptors.FieldDescriptor field) { + com.google.protobuf.Descriptors.FieldDescriptor field + ) { return super.clearField(field); } @java.lang.Override public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { + com.google.protobuf.Descriptors.OneofDescriptor oneof + ) { return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, + java.lang.Object value + ) { return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value + ) { return super.addRepeatedField(field, value); } @@ -3863,7 +4141,8 @@ public final class ProtobufMessages { } public Builder mergeFrom(dev.slimevr.bridge.ProtobufMessages.TrackerAdded other) { - if (other == dev.slimevr.bridge.ProtobufMessages.TrackerAdded.getDefaultInstance()) return this; + if (other == dev.slimevr.bridge.ProtobufMessages.TrackerAdded.getDefaultInstance()) + return this; if (other.getTrackerId() != 0) { setTrackerId(other.getTrackerId()); } @@ -3890,14 +4169,16 @@ public final class ProtobufMessages { @java.lang.Override public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws java.io.IOException { dev.slimevr.bridge.ProtobufMessages.TrackerAdded parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (dev.slimevr.bridge.ProtobufMessages.TrackerAdded) e.getUnfinishedMessage(); + parsedMessage = (dev.slimevr.bridge.ProtobufMessages.TrackerAdded) e + .getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -3951,8 +4232,7 @@ public final class ProtobufMessages { public java.lang.String getTrackerSerial() { java.lang.Object ref = trackerSerial_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); trackerSerial_ = s; return s; @@ -3968,7 +4248,8 @@ public final class ProtobufMessages { * @return This builder for chaining. */ public Builder setTrackerSerial( - java.lang.String value) { + java.lang.String value + ) { if (value == null) { throw new NullPointerException(); } @@ -3984,13 +4265,13 @@ public final class ProtobufMessages { * @return The bytes for trackerSerial. */ @Override - public com.google.protobuf.ByteString - getTrackerSerialBytes() { + public com.google.protobuf.ByteString getTrackerSerialBytes() { java.lang.Object ref = trackerSerial_; if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + com.google.protobuf.ByteString b = com.google.protobuf.ByteString + .copyFromUtf8( + (java.lang.String) ref + ); trackerSerial_ = b; return b; } else { @@ -4005,7 +4286,8 @@ public final class ProtobufMessages { * @return This builder for chaining. */ public Builder setTrackerSerialBytes( - com.google.protobuf.ByteString value) { + com.google.protobuf.ByteString value + ) { if (value == null) { throw new NullPointerException(); } @@ -4037,8 +4319,7 @@ public final class ProtobufMessages { public java.lang.String getTrackerName() { java.lang.Object ref = trackerName_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); trackerName_ = s; return s; @@ -4054,7 +4335,8 @@ public final class ProtobufMessages { * @return This builder for chaining. */ public Builder setTrackerName( - java.lang.String value) { + java.lang.String value + ) { if (value == null) { throw new NullPointerException(); } @@ -4070,13 +4352,13 @@ public final class ProtobufMessages { * @return The bytes for trackerName. */ @Override - public com.google.protobuf.ByteString - getTrackerNameBytes() { + public com.google.protobuf.ByteString getTrackerNameBytes() { java.lang.Object ref = trackerName_; if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + com.google.protobuf.ByteString b = com.google.protobuf.ByteString + .copyFromUtf8( + (java.lang.String) ref + ); trackerName_ = b; return b; } else { @@ -4091,7 +4373,8 @@ public final class ProtobufMessages { * @return This builder for chaining. */ public Builder setTrackerNameBytes( - com.google.protobuf.ByteString value) { + com.google.protobuf.ByteString value + ) { if (value == null) { throw new NullPointerException(); } @@ -4151,13 +4434,15 @@ public final class ProtobufMessages { @java.lang.Override public final Builder setUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { + final com.google.protobuf.UnknownFieldSet unknownFields + ) { return super.setUnknownFields(unknownFields); } @java.lang.Override public final Builder mergeUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { + final com.google.protobuf.UnknownFieldSet unknownFields + ) { return super.mergeUnknownFields(unknownFields); } @@ -4169,9 +4454,9 @@ public final class ProtobufMessages { * Protobuf type {@code messages.TrackerStatus} */ public static final class TrackerStatus extends - com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:messages.TrackerStatus) - TrackerStatusOrBuilder { + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:messages.TrackerStatus) + TrackerStatusOrBuilder { public static final int TRACKER_ID_FIELD_NUMBER = 1; public static final int STATUS_FIELD_NUMBER = 2; public static final int EXTRA_FIELD_NUMBER = 3; @@ -4179,13 +4464,13 @@ public final class ProtobufMessages { private static final long serialVersionUID = 0L; // @@protoc_insertion_point(class_scope:messages.TrackerStatus) private static final dev.slimevr.bridge.ProtobufMessages.TrackerStatus DEFAULT_INSTANCE; - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { + private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { @java.lang.Override public TrackerStatus parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws com.google.protobuf.InvalidProtocolBufferException { return new TrackerStatus(input, extensionRegistry); } }; @@ -4197,8 +4482,7 @@ public final class ProtobufMessages { private int bitField0_; private int trackerId_; private int status_; - private com.google.protobuf.MapField< - java.lang.String, java.lang.String> extra_; + private com.google.protobuf.MapField extra_; private int confidence_; private byte memoizedIsInitialized = -1; @@ -4213,16 +4497,17 @@ public final class ProtobufMessages { } private TrackerStatus( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws com.google.protobuf.InvalidProtocolBufferException { this(); if (extensionRegistry == null) { throw new java.lang.NullPointerException(); } int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); + com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet + .newBuilder(); try { boolean done = false; while (!done) { @@ -4244,15 +4529,23 @@ public final class ProtobufMessages { } case 26: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { - extra_ = com.google.protobuf.MapField.newMapField( - ExtraDefaultEntryHolder.defaultEntry); + extra_ = com.google.protobuf.MapField + .newMapField( + ExtraDefaultEntryHolder.defaultEntry + ); mutable_bitField0_ |= 0x00000001; } - com.google.protobuf.MapEntry - extra__ = input.readMessage( - ExtraDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry); - extra_.getMutableMap().put( - extra__.getKey(), extra__.getValue()); + com.google.protobuf.MapEntry extra__ = input + .readMessage( + ExtraDefaultEntryHolder.defaultEntry.getParserForType(), + extensionRegistry + ); + extra_ + .getMutableMap() + .put( + extra__.getKey(), + extra__.getValue() + ); break; } case 32: { @@ -4262,8 +4555,14 @@ public final class ProtobufMessages { break; } default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { + if ( + !parseUnknownField( + input, + unknownFields, + extensionRegistry, + tag + ) + ) { done = true; } break; @@ -4274,104 +4573,119 @@ public final class ProtobufMessages { throw e.setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); + e + ).setUnfinishedMessage(this); } finally { this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return dev.slimevr.bridge.ProtobufMessages.internal_static_messages_TrackerStatus_descriptor; } public static dev.slimevr.bridge.ProtobufMessages.TrackerStatus parseFrom( - java.nio.ByteBuffer data) - throws com.google.protobuf.InvalidProtocolBufferException { + java.nio.ByteBuffer data + ) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } public static dev.slimevr.bridge.ProtobufMessages.TrackerStatus parseFrom( - java.nio.ByteBuffer data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } public static dev.slimevr.bridge.ProtobufMessages.TrackerStatus parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { + com.google.protobuf.ByteString data + ) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } public static dev.slimevr.bridge.ProtobufMessages.TrackerStatus parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } public static dev.slimevr.bridge.ProtobufMessages.TrackerStatus parseFrom(byte[] data) - throws com.google.protobuf.InvalidProtocolBufferException { + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } public static dev.slimevr.bridge.ProtobufMessages.TrackerStatus parseFrom( - byte[] data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static dev.slimevr.bridge.ProtobufMessages.TrackerStatus parseFrom(java.io.InputStream input) - throws java.io.IOException { + public static dev.slimevr.bridge.ProtobufMessages.TrackerStatus parseFrom( + java.io.InputStream input + ) + throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input); + .parseWithIOException(PARSER, input); } public static dev.slimevr.bridge.ProtobufMessages.TrackerStatus parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input, extensionRegistry); - } - - public static dev.slimevr.bridge.ProtobufMessages.TrackerStatus parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseDelimitedWithIOException(PARSER, input); + .parseWithIOException(PARSER, input, extensionRegistry); } public static dev.slimevr.bridge.ProtobufMessages.TrackerStatus parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { + java.io.InputStream input + ) + throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 - .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + .parseDelimitedWithIOException(PARSER, input); + } + + public static dev.slimevr.bridge.ProtobufMessages.TrackerStatus parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } public static dev.slimevr.bridge.ProtobufMessages.TrackerStatus parseFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { + com.google.protobuf.CodedInputStream input + ) + throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input); + .parseWithIOException(PARSER, input); } public static dev.slimevr.bridge.ProtobufMessages.TrackerStatus parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input, extensionRegistry); + .parseWithIOException(PARSER, input, extensionRegistry); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(dev.slimevr.bridge.ProtobufMessages.TrackerStatus prototype) { + public static Builder newBuilder( + dev.slimevr.bridge.ProtobufMessages.TrackerStatus prototype + ) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @@ -4384,37 +4698,40 @@ public final class ProtobufMessages { } @java.lang.Override - @SuppressWarnings({"unused"}) + @SuppressWarnings({ "unused" }) protected java.lang.Object newInstance( - UnusedPrivateParameter unused) { + UnusedPrivateParameter unused + ) { return new TrackerStatus(); } @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { + public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - @SuppressWarnings({"rawtypes"}) + @SuppressWarnings({ "rawtypes" }) @java.lang.Override protected com.google.protobuf.MapField internalGetMapField( - int number) { + int number + ) { switch (number) { case 3: return internalGetExtra(); default: throw new RuntimeException( - "Invalid map field number: " + number); + "Invalid map field number: " + number + ); } } @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return dev.slimevr.bridge.ProtobufMessages.internal_static_messages_TrackerStatus_fieldAccessorTable - .ensureFieldAccessorsInitialized( - dev.slimevr.bridge.ProtobufMessages.TrackerStatus.class, dev.slimevr.bridge.ProtobufMessages.TrackerStatus.Builder.class); + .ensureFieldAccessorsInitialized( + dev.slimevr.bridge.ProtobufMessages.TrackerStatus.class, + dev.slimevr.bridge.ProtobufMessages.TrackerStatus.Builder.class + ); } /** @@ -4445,15 +4762,19 @@ public final class ProtobufMessages { @java.lang.Override public dev.slimevr.bridge.ProtobufMessages.TrackerStatus.Status getStatus() { @SuppressWarnings("deprecation") - dev.slimevr.bridge.ProtobufMessages.TrackerStatus.Status result = dev.slimevr.bridge.ProtobufMessages.TrackerStatus.Status.valueOf(status_); - return result == null ? dev.slimevr.bridge.ProtobufMessages.TrackerStatus.Status.UNRECOGNIZED : result; + dev.slimevr.bridge.ProtobufMessages.TrackerStatus.Status result = dev.slimevr.bridge.ProtobufMessages.TrackerStatus.Status + .valueOf(status_); + return result == null + ? dev.slimevr.bridge.ProtobufMessages.TrackerStatus.Status.UNRECOGNIZED + : result; } - private com.google.protobuf.MapField - internalGetExtra() { + private com.google.protobuf.MapField internalGetExtra() { if (extra_ == null) { - return com.google.protobuf.MapField.emptyMapField( - ExtraDefaultEntryHolder.defaultEntry); + return com.google.protobuf.MapField + .emptyMapField( + ExtraDefaultEntryHolder.defaultEntry + ); } return extra_; } @@ -4469,7 +4790,8 @@ public final class ProtobufMessages { @java.lang.Override public boolean containsExtra( - java.lang.String key) { + java.lang.String key + ) { if (key == null) { throw new java.lang.NullPointerException(); } @@ -4500,13 +4822,13 @@ public final class ProtobufMessages { @java.lang.Override public java.lang.String getExtraOrDefault( - java.lang.String key, - java.lang.String defaultValue) { + java.lang.String key, + java.lang.String defaultValue + ) { if (key == null) { throw new java.lang.NullPointerException(); } - java.util.Map map = - internalGetExtra().getMap(); + java.util.Map map = internalGetExtra().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; } @@ -4516,12 +4838,12 @@ public final class ProtobufMessages { @java.lang.Override public java.lang.String getExtraOrThrow( - java.lang.String key) { + java.lang.String key + ) { if (key == null) { throw new java.lang.NullPointerException(); } - java.util.Map map = - internalGetExtra().getMap(); + java.util.Map map = internalGetExtra().getMap(); if (!map.containsKey(key)) { throw new java.lang.IllegalArgumentException(); } @@ -4556,15 +4878,20 @@ public final class ProtobufMessages { @java.lang.Override public dev.slimevr.bridge.ProtobufMessages.TrackerStatus.Confidence getConfidence() { @SuppressWarnings("deprecation") - dev.slimevr.bridge.ProtobufMessages.TrackerStatus.Confidence result = dev.slimevr.bridge.ProtobufMessages.TrackerStatus.Confidence.valueOf(confidence_); - return result == null ? dev.slimevr.bridge.ProtobufMessages.TrackerStatus.Confidence.UNRECOGNIZED : result; + dev.slimevr.bridge.ProtobufMessages.TrackerStatus.Confidence result = dev.slimevr.bridge.ProtobufMessages.TrackerStatus.Confidence + .valueOf(confidence_); + return result == null + ? dev.slimevr.bridge.ProtobufMessages.TrackerStatus.Confidence.UNRECOGNIZED + : result; } @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; - if (isInitialized == 1) return true; - if (isInitialized == 0) return false; + if (isInitialized == 1) + return true; + if (isInitialized == 0) + return false; memoizedIsInitialized = 1; return true; @@ -4572,19 +4899,24 @@ public final class ProtobufMessages { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { + throws java.io.IOException { if (trackerId_ != 0) { output.writeInt32(1, trackerId_); } - if (status_ != dev.slimevr.bridge.ProtobufMessages.TrackerStatus.Status.DISCONNECTED.getNumber()) { + if ( + status_ + != dev.slimevr.bridge.ProtobufMessages.TrackerStatus.Status.DISCONNECTED + .getNumber() + ) { output.writeEnum(2, status_); } com.google.protobuf.GeneratedMessageV3 - .serializeStringMapTo( - output, - internalGetExtra(), - ExtraDefaultEntryHolder.defaultEntry, - 3); + .serializeStringMapTo( + output, + internalGetExtra(), + ExtraDefaultEntryHolder.defaultEntry, + 3 + ); if (((bitField0_ & 0x00000001) != 0)) { output.writeEnum(4, confidence_); } @@ -4594,30 +4926,38 @@ public final class ProtobufMessages { @java.lang.Override public int getSerializedSize() { int size = memoizedSize; - if (size != -1) return size; + if (size != -1) + return size; size = 0; if (trackerId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(1, trackerId_); + .computeInt32Size(1, trackerId_); } - if (status_ != dev.slimevr.bridge.ProtobufMessages.TrackerStatus.Status.DISCONNECTED.getNumber()) { + if ( + status_ + != dev.slimevr.bridge.ProtobufMessages.TrackerStatus.Status.DISCONNECTED + .getNumber() + ) { size += com.google.protobuf.CodedOutputStream - .computeEnumSize(2, status_); + .computeEnumSize(2, status_); } - for (java.util.Map.Entry entry - : internalGetExtra().getMap().entrySet()) { - com.google.protobuf.MapEntry - extra__ = ExtraDefaultEntryHolder.defaultEntry.newBuilderForType() - .setKey(entry.getKey()) - .setValue(entry.getValue()) - .build(); + for ( + java.util.Map.Entry entry : internalGetExtra() + .getMap() + .entrySet() + ) { + com.google.protobuf.MapEntry extra__ = ExtraDefaultEntryHolder.defaultEntry + .newBuilderForType() + .setKey(entry.getKey()) + .setValue(entry.getValue()) + .build(); size += com.google.protobuf.CodedOutputStream - .computeMessageSize(3, extra__); + .computeMessageSize(3, extra__); } if (((bitField0_ & 0x00000001) != 0)) { size += com.google.protobuf.CodedOutputStream - .computeEnumSize(4, confidence_); + .computeEnumSize(4, confidence_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -4634,14 +4974,22 @@ public final class ProtobufMessages { } dev.slimevr.bridge.ProtobufMessages.TrackerStatus other = (dev.slimevr.bridge.ProtobufMessages.TrackerStatus) obj; - if (getTrackerId() - != other.getTrackerId()) return false; - if (status_ != other.status_) return false; - if (!internalGetExtra().equals( - other.internalGetExtra())) return false; - if (hasConfidence() != other.hasConfidence()) return false; + if (getTrackerId() != other.getTrackerId()) + return false; + if (status_ != other.status_) + return false; + if ( + !internalGetExtra() + .equals( + other.internalGetExtra() + ) + ) + return false; + if (hasConfidence() != other.hasConfidence()) + return false; if (hasConfidence()) { - if (confidence_ != other.confidence_) return false; + if (confidence_ != other.confidence_) + return false; } return unknownFields.equals(other.unknownFields); } @@ -4678,12 +5026,14 @@ public final class ProtobufMessages { @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE - ? new Builder() : new Builder().mergeFrom(this); + ? new Builder() + : new Builder().mergeFrom(this); } @java.lang.Override protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + com.google.protobuf.GeneratedMessageV3.BuilderParent parent + ) { Builder builder = new Builder(parent); return builder; } @@ -4702,7 +5052,7 @@ public final class ProtobufMessages { * Protobuf enum {@code messages.TrackerStatus.Status} */ public enum Status - implements com.google.protobuf.ProtocolMessageEnum { + implements com.google.protobuf.ProtocolMessageEnum { /** * DISCONNECTED = 0; */ @@ -4746,14 +5096,12 @@ public final class ProtobufMessages { * OCCLUDED = 4; */ public static final int OCCLUDED_VALUE = 4; - private static final com.google.protobuf.Internal.EnumLiteMap< - Status> internalValueMap = - new com.google.protobuf.Internal.EnumLiteMap() { - @Override - public Status findValueByNumber(int number) { - return Status.forNumber(number); - } - }; + private static final com.google.protobuf.Internal.EnumLiteMap internalValueMap = new com.google.protobuf.Internal.EnumLiteMap() { + @Override + public Status findValueByNumber(int number) { + return Status.forNumber(number); + } + }; private static final Status[] VALUES = values(); private final int value; @@ -4762,7 +5110,8 @@ public final class ProtobufMessages { } /** - * @param value The numeric wire value of the corresponding enum entry. + * @param value The numeric wire value of the corresponding enum + * entry. * @return The enum associated with the given numeric wire value. * @deprecated Use {@link #forNumber(int)} instead. */ @@ -4772,7 +5121,8 @@ public final class ProtobufMessages { } /** - * @param value The numeric wire value of the corresponding enum entry. + * @param value The numeric wire value of the corresponding enum + * entry. * @return The enum associated with the given numeric wire value. */ public static Status forNumber(int value) { @@ -4792,21 +5142,24 @@ public final class ProtobufMessages { } } - public static com.google.protobuf.Internal.EnumLiteMap - internalGetValueMap() { + public static com.google.protobuf.Internal.EnumLiteMap internalGetValueMap() { return internalValueMap; } - public static final com.google.protobuf.Descriptors.EnumDescriptor - getDescriptor() { - return dev.slimevr.bridge.ProtobufMessages.TrackerStatus.getDescriptor().getEnumTypes().get(0); + public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { + return dev.slimevr.bridge.ProtobufMessages.TrackerStatus + .getDescriptor() + .getEnumTypes() + .get(0); } public static Status valueOf( - com.google.protobuf.Descriptors.EnumValueDescriptor desc) { + com.google.protobuf.Descriptors.EnumValueDescriptor desc + ) { if (desc.getType() != getDescriptor()) { throw new java.lang.IllegalArgumentException( - "EnumValueDescriptor is not for this type."); + "EnumValueDescriptor is not for this type." + ); } if (desc.getIndex() == -1) { return UNRECOGNIZED; @@ -4818,24 +5171,24 @@ public final class ProtobufMessages { public final int getNumber() { if (this == UNRECOGNIZED) { throw new java.lang.IllegalArgumentException( - "Can't get the number of an unknown enum value."); + "Can't get the number of an unknown enum value." + ); } return value; } @Override - public final com.google.protobuf.Descriptors.EnumValueDescriptor - getValueDescriptor() { + public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() { if (this == UNRECOGNIZED) { throw new java.lang.IllegalStateException( - "Can't get the descriptor of an unrecognized enum value."); + "Can't get the descriptor of an unrecognized enum value." + ); } return getDescriptor().getValues().get(ordinal()); } @Override - public final com.google.protobuf.Descriptors.EnumDescriptor - getDescriptorForType() { + public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() { return getDescriptor(); } @@ -4846,7 +5199,7 @@ public final class ProtobufMessages { * Protobuf enum {@code messages.TrackerStatus.Confidence} */ public enum Confidence - implements com.google.protobuf.ProtocolMessageEnum { + implements com.google.protobuf.ProtocolMessageEnum { /** * NO = 0; */ @@ -4882,14 +5235,12 @@ public final class ProtobufMessages { * HIGH = 10; */ public static final int HIGH_VALUE = 10; - private static final com.google.protobuf.Internal.EnumLiteMap< - Confidence> internalValueMap = - new com.google.protobuf.Internal.EnumLiteMap() { - @Override - public Confidence findValueByNumber(int number) { - return Confidence.forNumber(number); - } - }; + private static final com.google.protobuf.Internal.EnumLiteMap internalValueMap = new com.google.protobuf.Internal.EnumLiteMap() { + @Override + public Confidence findValueByNumber(int number) { + return Confidence.forNumber(number); + } + }; private static final Confidence[] VALUES = values(); private final int value; @@ -4898,7 +5249,8 @@ public final class ProtobufMessages { } /** - * @param value The numeric wire value of the corresponding enum entry. + * @param value The numeric wire value of the corresponding enum + * entry. * @return The enum associated with the given numeric wire value. * @deprecated Use {@link #forNumber(int)} instead. */ @@ -4908,7 +5260,8 @@ public final class ProtobufMessages { } /** - * @param value The numeric wire value of the corresponding enum entry. + * @param value The numeric wire value of the corresponding enum + * entry. * @return The enum associated with the given numeric wire value. */ public static Confidence forNumber(int value) { @@ -4926,21 +5279,24 @@ public final class ProtobufMessages { } } - public static com.google.protobuf.Internal.EnumLiteMap - internalGetValueMap() { + public static com.google.protobuf.Internal.EnumLiteMap internalGetValueMap() { return internalValueMap; } - public static final com.google.protobuf.Descriptors.EnumDescriptor - getDescriptor() { - return dev.slimevr.bridge.ProtobufMessages.TrackerStatus.getDescriptor().getEnumTypes().get(1); + public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { + return dev.slimevr.bridge.ProtobufMessages.TrackerStatus + .getDescriptor() + .getEnumTypes() + .get(1); } public static Confidence valueOf( - com.google.protobuf.Descriptors.EnumValueDescriptor desc) { + com.google.protobuf.Descriptors.EnumValueDescriptor desc + ) { if (desc.getType() != getDescriptor()) { throw new java.lang.IllegalArgumentException( - "EnumValueDescriptor is not for this type."); + "EnumValueDescriptor is not for this type." + ); } if (desc.getIndex() == -1) { return UNRECOGNIZED; @@ -4952,24 +5308,24 @@ public final class ProtobufMessages { public final int getNumber() { if (this == UNRECOGNIZED) { throw new java.lang.IllegalArgumentException( - "Can't get the number of an unknown enum value."); + "Can't get the number of an unknown enum value." + ); } return value; } @Override - public final com.google.protobuf.Descriptors.EnumValueDescriptor - getValueDescriptor() { + public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() { if (this == UNRECOGNIZED) { throw new java.lang.IllegalStateException( - "Can't get the descriptor of an unrecognized enum value."); + "Can't get the descriptor of an unrecognized enum value." + ); } return getDescriptor().getValues().get(ordinal()); } @Override - public final com.google.protobuf.Descriptors.EnumDescriptor - getDescriptorForType() { + public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() { return getDescriptor(); } @@ -4977,85 +5333,87 @@ public final class ProtobufMessages { } private static final class ExtraDefaultEntryHolder { - static final com.google.protobuf.MapEntry< - java.lang.String, java.lang.String> defaultEntry = - com.google.protobuf.MapEntry - .newDefaultInstance( - dev.slimevr.bridge.ProtobufMessages.internal_static_messages_TrackerStatus_ExtraEntry_descriptor, - com.google.protobuf.WireFormat.FieldType.STRING, - "", - com.google.protobuf.WireFormat.FieldType.STRING, - ""); + static final com.google.protobuf.MapEntry defaultEntry = com.google.protobuf.MapEntry + .newDefaultInstance( + dev.slimevr.bridge.ProtobufMessages.internal_static_messages_TrackerStatus_ExtraEntry_descriptor, + com.google.protobuf.WireFormat.FieldType.STRING, + "", + com.google.protobuf.WireFormat.FieldType.STRING, + "" + ); } /** * Protobuf type {@code messages.TrackerStatus} */ public static final class Builder extends - com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:messages.TrackerStatus) - dev.slimevr.bridge.ProtobufMessages.TrackerStatusOrBuilder { + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:messages.TrackerStatus) + dev.slimevr.bridge.ProtobufMessages.TrackerStatusOrBuilder { private int bitField0_; private int trackerId_; private int status_ = 0; - private com.google.protobuf.MapField< - java.lang.String, java.lang.String> extra_; + private com.google.protobuf.MapField extra_; private int confidence_ = 0; - // Construct using dev.slimevr.bridge.ProtobufMessages.TrackerStatus.newBuilder() + // Construct using + // dev.slimevr.bridge.ProtobufMessages.TrackerStatus.newBuilder() private Builder() { maybeForceBuilderInitialization(); } private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + com.google.protobuf.GeneratedMessageV3.BuilderParent parent + ) { super(parent); maybeForceBuilderInitialization(); } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return dev.slimevr.bridge.ProtobufMessages.internal_static_messages_TrackerStatus_descriptor; } @Override - @SuppressWarnings({"rawtypes"}) + @SuppressWarnings({ "rawtypes" }) protected com.google.protobuf.MapField internalGetMapField( - int number) { + int number + ) { switch (number) { case 3: return internalGetExtra(); default: throw new RuntimeException( - "Invalid map field number: " + number); + "Invalid map field number: " + number + ); } } @Override - @SuppressWarnings({"rawtypes"}) + @SuppressWarnings({ "rawtypes" }) protected com.google.protobuf.MapField internalGetMutableMapField( - int number) { + int number + ) { switch (number) { case 3: return internalGetMutableExtra(); default: throw new RuntimeException( - "Invalid map field number: " + number); + "Invalid map field number: " + number + ); } } @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return dev.slimevr.bridge.ProtobufMessages.internal_static_messages_TrackerStatus_fieldAccessorTable - .ensureFieldAccessorsInitialized( - dev.slimevr.bridge.ProtobufMessages.TrackerStatus.class, dev.slimevr.bridge.ProtobufMessages.TrackerStatus.Builder.class); + .ensureFieldAccessorsInitialized( + dev.slimevr.bridge.ProtobufMessages.TrackerStatus.class, + dev.slimevr.bridge.ProtobufMessages.TrackerStatus.Builder.class + ); } private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } + if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -5072,8 +5430,7 @@ public final class ProtobufMessages { } @java.lang.Override - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return dev.slimevr.bridge.ProtobufMessages.internal_static_messages_TrackerStatus_descriptor; } @@ -5093,7 +5450,9 @@ public final class ProtobufMessages { @java.lang.Override public dev.slimevr.bridge.ProtobufMessages.TrackerStatus buildPartial() { - dev.slimevr.bridge.ProtobufMessages.TrackerStatus result = new dev.slimevr.bridge.ProtobufMessages.TrackerStatus(this); + dev.slimevr.bridge.ProtobufMessages.TrackerStatus result = new dev.slimevr.bridge.ProtobufMessages.TrackerStatus( + this + ); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; result.trackerId_ = trackerId_; @@ -5116,34 +5475,40 @@ public final class ProtobufMessages { @java.lang.Override public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value + ) { return super.setField(field, value); } @java.lang.Override public Builder clearField( - com.google.protobuf.Descriptors.FieldDescriptor field) { + com.google.protobuf.Descriptors.FieldDescriptor field + ) { return super.clearField(field); } @java.lang.Override public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { + com.google.protobuf.Descriptors.OneofDescriptor oneof + ) { return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, + java.lang.Object value + ) { return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value + ) { return super.addRepeatedField(field, value); } @@ -5158,15 +5523,18 @@ public final class ProtobufMessages { } public Builder mergeFrom(dev.slimevr.bridge.ProtobufMessages.TrackerStatus other) { - if (other == dev.slimevr.bridge.ProtobufMessages.TrackerStatus.getDefaultInstance()) return this; + if (other == dev.slimevr.bridge.ProtobufMessages.TrackerStatus.getDefaultInstance()) + return this; if (other.getTrackerId() != 0) { setTrackerId(other.getTrackerId()); } if (other.status_ != 0) { setStatusValue(other.getStatusValue()); } - internalGetMutableExtra().mergeFrom( - other.internalGetExtra()); + internalGetMutableExtra() + .mergeFrom( + other.internalGetExtra() + ); if (other.hasConfidence()) { setConfidence(other.getConfidence()); } @@ -5182,14 +5550,16 @@ public final class ProtobufMessages { @java.lang.Override public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws java.io.IOException { dev.slimevr.bridge.ProtobufMessages.TrackerStatus parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (dev.slimevr.bridge.ProtobufMessages.TrackerStatus) e.getUnfinishedMessage(); + parsedMessage = (dev.slimevr.bridge.ProtobufMessages.TrackerStatus) e + .getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -5247,7 +5617,8 @@ public final class ProtobufMessages { /** * .messages.TrackerStatus.Status status = 2; * - * @param value The enum numeric value on the wire for status to set. + * @param value The enum numeric value on the wire for status to + * set. * @return This builder for chaining. */ public Builder setStatusValue(int value) { @@ -5265,8 +5636,11 @@ public final class ProtobufMessages { @java.lang.Override public dev.slimevr.bridge.ProtobufMessages.TrackerStatus.Status getStatus() { @SuppressWarnings("deprecation") - dev.slimevr.bridge.ProtobufMessages.TrackerStatus.Status result = dev.slimevr.bridge.ProtobufMessages.TrackerStatus.Status.valueOf(status_); - return result == null ? dev.slimevr.bridge.ProtobufMessages.TrackerStatus.Status.UNRECOGNIZED : result; + dev.slimevr.bridge.ProtobufMessages.TrackerStatus.Status result = dev.slimevr.bridge.ProtobufMessages.TrackerStatus.Status + .valueOf(status_); + return result == null + ? dev.slimevr.bridge.ProtobufMessages.TrackerStatus.Status.UNRECOGNIZED + : result; } /** @@ -5275,7 +5649,9 @@ public final class ProtobufMessages { * @param value The status to set. * @return This builder for chaining. */ - public Builder setStatus(dev.slimevr.bridge.ProtobufMessages.TrackerStatus.Status value) { + public Builder setStatus( + dev.slimevr.bridge.ProtobufMessages.TrackerStatus.Status value + ) { if (value == null) { throw new NullPointerException(); } @@ -5297,21 +5673,23 @@ public final class ProtobufMessages { return this; } - private com.google.protobuf.MapField - internalGetExtra() { + private com.google.protobuf.MapField internalGetExtra() { if (extra_ == null) { - return com.google.protobuf.MapField.emptyMapField( - ExtraDefaultEntryHolder.defaultEntry); + return com.google.protobuf.MapField + .emptyMapField( + ExtraDefaultEntryHolder.defaultEntry + ); } return extra_; } - private com.google.protobuf.MapField - internalGetMutableExtra() { + private com.google.protobuf.MapField internalGetMutableExtra() { onChanged(); if (extra_ == null) { - extra_ = com.google.protobuf.MapField.newMapField( - ExtraDefaultEntryHolder.defaultEntry); + extra_ = com.google.protobuf.MapField + .newMapField( + ExtraDefaultEntryHolder.defaultEntry + ); } if (!extra_.isMutable()) { extra_ = extra_.copy(); @@ -5330,7 +5708,8 @@ public final class ProtobufMessages { @java.lang.Override public boolean containsExtra( - java.lang.String key) { + java.lang.String key + ) { if (key == null) { throw new java.lang.NullPointerException(); } @@ -5361,13 +5740,13 @@ public final class ProtobufMessages { @java.lang.Override public java.lang.String getExtraOrDefault( - java.lang.String key, - java.lang.String defaultValue) { + java.lang.String key, + java.lang.String defaultValue + ) { if (key == null) { throw new java.lang.NullPointerException(); } - java.util.Map map = - internalGetExtra().getMap(); + java.util.Map map = internalGetExtra().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; } @@ -5377,12 +5756,12 @@ public final class ProtobufMessages { @java.lang.Override public java.lang.String getExtraOrThrow( - java.lang.String key) { + java.lang.String key + ) { if (key == null) { throw new java.lang.NullPointerException(); } - java.util.Map map = - internalGetExtra().getMap(); + java.util.Map map = internalGetExtra().getMap(); if (!map.containsKey(key)) { throw new java.lang.IllegalArgumentException(); } @@ -5390,8 +5769,9 @@ public final class ProtobufMessages { } public Builder clearExtra() { - internalGetMutableExtra().getMutableMap() - .clear(); + internalGetMutableExtra() + .getMutableMap() + .clear(); return this; } @@ -5400,12 +5780,14 @@ public final class ProtobufMessages { */ public Builder removeExtra( - java.lang.String key) { + java.lang.String key + ) { if (key == null) { throw new java.lang.NullPointerException(); } - internalGetMutableExtra().getMutableMap() - .remove(key); + internalGetMutableExtra() + .getMutableMap() + .remove(key); return this; } @@ -5413,8 +5795,7 @@ public final class ProtobufMessages { * Use alternate mutation accessors instead. */ @java.lang.Deprecated - public java.util.Map - getMutableExtra() { + public java.util.Map getMutableExtra() { return internalGetMutableExtra().getMutableMap(); } @@ -5422,16 +5803,18 @@ public final class ProtobufMessages { * map<string, string> extra = 3; */ public Builder putExtra( - java.lang.String key, - java.lang.String value) { + java.lang.String key, + java.lang.String value + ) { if (key == null) { throw new java.lang.NullPointerException(); } if (value == null) { throw new java.lang.NullPointerException(); } - internalGetMutableExtra().getMutableMap() - .put(key, value); + internalGetMutableExtra() + .getMutableMap() + .put(key, value); return this; } @@ -5440,9 +5823,11 @@ public final class ProtobufMessages { */ public Builder putAllExtra( - java.util.Map values) { - internalGetMutableExtra().getMutableMap() - .putAll(values); + java.util.Map values + ) { + internalGetMutableExtra() + .getMutableMap() + .putAll(values); return this; } @@ -5469,7 +5854,8 @@ public final class ProtobufMessages { /** * .messages.TrackerStatus.Confidence confidence = 4; * - * @param value The enum numeric value on the wire for confidence to set. + * @param value The enum numeric value on the wire for confidence to + * set. * @return This builder for chaining. */ public Builder setConfidenceValue(int value) { @@ -5487,8 +5873,11 @@ public final class ProtobufMessages { @java.lang.Override public dev.slimevr.bridge.ProtobufMessages.TrackerStatus.Confidence getConfidence() { @SuppressWarnings("deprecation") - dev.slimevr.bridge.ProtobufMessages.TrackerStatus.Confidence result = dev.slimevr.bridge.ProtobufMessages.TrackerStatus.Confidence.valueOf(confidence_); - return result == null ? dev.slimevr.bridge.ProtobufMessages.TrackerStatus.Confidence.UNRECOGNIZED : result; + dev.slimevr.bridge.ProtobufMessages.TrackerStatus.Confidence result = dev.slimevr.bridge.ProtobufMessages.TrackerStatus.Confidence + .valueOf(confidence_); + return result == null + ? dev.slimevr.bridge.ProtobufMessages.TrackerStatus.Confidence.UNRECOGNIZED + : result; } /** @@ -5497,7 +5886,9 @@ public final class ProtobufMessages { * @param value The confidence to set. * @return This builder for chaining. */ - public Builder setConfidence(dev.slimevr.bridge.ProtobufMessages.TrackerStatus.Confidence value) { + public Builder setConfidence( + dev.slimevr.bridge.ProtobufMessages.TrackerStatus.Confidence value + ) { if (value == null) { throw new NullPointerException(); } @@ -5521,13 +5912,15 @@ public final class ProtobufMessages { @java.lang.Override public final Builder setUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { + final com.google.protobuf.UnknownFieldSet unknownFields + ) { return super.setUnknownFields(unknownFields); } @java.lang.Override public final Builder mergeUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { + final com.google.protobuf.UnknownFieldSet unknownFields + ) { return super.mergeUnknownFields(unknownFields); } @@ -5539,9 +5932,9 @@ public final class ProtobufMessages { * Protobuf type {@code messages.ProtobufMessage} */ public static final class ProtobufMessage extends - com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:messages.ProtobufMessage) - ProtobufMessageOrBuilder { + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:messages.ProtobufMessage) + ProtobufMessageOrBuilder { public static final int POSITION_FIELD_NUMBER = 1; public static final int USER_ACTION_FIELD_NUMBER = 2; public static final int TRACKER_ADDED_FIELD_NUMBER = 3; @@ -5549,13 +5942,13 @@ public final class ProtobufMessages { private static final long serialVersionUID = 0L; // @@protoc_insertion_point(class_scope:messages.ProtobufMessage) private static final dev.slimevr.bridge.ProtobufMessages.ProtobufMessage DEFAULT_INSTANCE; - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { + private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { @java.lang.Override public ProtobufMessage parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws com.google.protobuf.InvalidProtocolBufferException { return new ProtobufMessage(input, extensionRegistry); } }; @@ -5577,15 +5970,16 @@ public final class ProtobufMessages { } private ProtobufMessage( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws com.google.protobuf.InvalidProtocolBufferException { this(); if (extensionRegistry == null) { throw new java.lang.NullPointerException(); } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); + com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet + .newBuilder(); try { boolean done = false; while (!done) { @@ -5597,12 +5991,19 @@ public final class ProtobufMessages { case 10: { dev.slimevr.bridge.ProtobufMessages.Position.Builder subBuilder = null; if (messageCase_ == 1) { - subBuilder = ((dev.slimevr.bridge.ProtobufMessages.Position) message_).toBuilder(); + subBuilder = ((dev.slimevr.bridge.ProtobufMessages.Position) message_) + .toBuilder(); } - message_ = - input.readMessage(dev.slimevr.bridge.ProtobufMessages.Position.parser(), extensionRegistry); + message_ = input + .readMessage( + dev.slimevr.bridge.ProtobufMessages.Position.parser(), + extensionRegistry + ); if (subBuilder != null) { - subBuilder.mergeFrom((dev.slimevr.bridge.ProtobufMessages.Position) message_); + subBuilder + .mergeFrom( + (dev.slimevr.bridge.ProtobufMessages.Position) message_ + ); message_ = subBuilder.buildPartial(); } messageCase_ = 1; @@ -5611,12 +6012,19 @@ public final class ProtobufMessages { case 18: { dev.slimevr.bridge.ProtobufMessages.UserAction.Builder subBuilder = null; if (messageCase_ == 2) { - subBuilder = ((dev.slimevr.bridge.ProtobufMessages.UserAction) message_).toBuilder(); + subBuilder = ((dev.slimevr.bridge.ProtobufMessages.UserAction) message_) + .toBuilder(); } - message_ = - input.readMessage(dev.slimevr.bridge.ProtobufMessages.UserAction.parser(), extensionRegistry); + message_ = input + .readMessage( + dev.slimevr.bridge.ProtobufMessages.UserAction.parser(), + extensionRegistry + ); if (subBuilder != null) { - subBuilder.mergeFrom((dev.slimevr.bridge.ProtobufMessages.UserAction) message_); + subBuilder + .mergeFrom( + (dev.slimevr.bridge.ProtobufMessages.UserAction) message_ + ); message_ = subBuilder.buildPartial(); } messageCase_ = 2; @@ -5625,12 +6033,19 @@ public final class ProtobufMessages { case 26: { dev.slimevr.bridge.ProtobufMessages.TrackerAdded.Builder subBuilder = null; if (messageCase_ == 3) { - subBuilder = ((dev.slimevr.bridge.ProtobufMessages.TrackerAdded) message_).toBuilder(); + subBuilder = ((dev.slimevr.bridge.ProtobufMessages.TrackerAdded) message_) + .toBuilder(); } - message_ = - input.readMessage(dev.slimevr.bridge.ProtobufMessages.TrackerAdded.parser(), extensionRegistry); + message_ = input + .readMessage( + dev.slimevr.bridge.ProtobufMessages.TrackerAdded.parser(), + extensionRegistry + ); if (subBuilder != null) { - subBuilder.mergeFrom((dev.slimevr.bridge.ProtobufMessages.TrackerAdded) message_); + subBuilder + .mergeFrom( + (dev.slimevr.bridge.ProtobufMessages.TrackerAdded) message_ + ); message_ = subBuilder.buildPartial(); } messageCase_ = 3; @@ -5639,20 +6054,33 @@ public final class ProtobufMessages { case 34: { dev.slimevr.bridge.ProtobufMessages.TrackerStatus.Builder subBuilder = null; if (messageCase_ == 4) { - subBuilder = ((dev.slimevr.bridge.ProtobufMessages.TrackerStatus) message_).toBuilder(); + subBuilder = ((dev.slimevr.bridge.ProtobufMessages.TrackerStatus) message_) + .toBuilder(); } - message_ = - input.readMessage(dev.slimevr.bridge.ProtobufMessages.TrackerStatus.parser(), extensionRegistry); + message_ = input + .readMessage( + dev.slimevr.bridge.ProtobufMessages.TrackerStatus.parser(), + extensionRegistry + ); if (subBuilder != null) { - subBuilder.mergeFrom((dev.slimevr.bridge.ProtobufMessages.TrackerStatus) message_); + subBuilder + .mergeFrom( + (dev.slimevr.bridge.ProtobufMessages.TrackerStatus) message_ + ); message_ = subBuilder.buildPartial(); } messageCase_ = 4; break; } default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { + if ( + !parseUnknownField( + input, + unknownFields, + extensionRegistry, + tag + ) + ) { done = true; } break; @@ -5663,104 +6091,119 @@ public final class ProtobufMessages { throw e.setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); + e + ).setUnfinishedMessage(this); } finally { this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return dev.slimevr.bridge.ProtobufMessages.internal_static_messages_ProtobufMessage_descriptor; } public static dev.slimevr.bridge.ProtobufMessages.ProtobufMessage parseFrom( - java.nio.ByteBuffer data) - throws com.google.protobuf.InvalidProtocolBufferException { + java.nio.ByteBuffer data + ) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } public static dev.slimevr.bridge.ProtobufMessages.ProtobufMessage parseFrom( - java.nio.ByteBuffer data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } public static dev.slimevr.bridge.ProtobufMessages.ProtobufMessage parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { + com.google.protobuf.ByteString data + ) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } public static dev.slimevr.bridge.ProtobufMessages.ProtobufMessage parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } public static dev.slimevr.bridge.ProtobufMessages.ProtobufMessage parseFrom(byte[] data) - throws com.google.protobuf.InvalidProtocolBufferException { + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } public static dev.slimevr.bridge.ProtobufMessages.ProtobufMessage parseFrom( - byte[] data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static dev.slimevr.bridge.ProtobufMessages.ProtobufMessage parseFrom(java.io.InputStream input) - throws java.io.IOException { + public static dev.slimevr.bridge.ProtobufMessages.ProtobufMessage parseFrom( + java.io.InputStream input + ) + throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input); + .parseWithIOException(PARSER, input); } public static dev.slimevr.bridge.ProtobufMessages.ProtobufMessage parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input, extensionRegistry); - } - - public static dev.slimevr.bridge.ProtobufMessages.ProtobufMessage parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseDelimitedWithIOException(PARSER, input); + .parseWithIOException(PARSER, input, extensionRegistry); } public static dev.slimevr.bridge.ProtobufMessages.ProtobufMessage parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { + java.io.InputStream input + ) + throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 - .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + .parseDelimitedWithIOException(PARSER, input); + } + + public static dev.slimevr.bridge.ProtobufMessages.ProtobufMessage parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } public static dev.slimevr.bridge.ProtobufMessages.ProtobufMessage parseFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { + com.google.protobuf.CodedInputStream input + ) + throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input); + .parseWithIOException(PARSER, input); } public static dev.slimevr.bridge.ProtobufMessages.ProtobufMessage parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input, extensionRegistry); + .parseWithIOException(PARSER, input, extensionRegistry); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(dev.slimevr.bridge.ProtobufMessages.ProtobufMessage prototype) { + public static Builder newBuilder( + dev.slimevr.bridge.ProtobufMessages.ProtobufMessage prototype + ) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @@ -5773,31 +6216,33 @@ public final class ProtobufMessages { } @java.lang.Override - @SuppressWarnings({"unused"}) + @SuppressWarnings({ "unused" }) protected java.lang.Object newInstance( - UnusedPrivateParameter unused) { + UnusedPrivateParameter unused + ) { return new ProtobufMessage(); } @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { + public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return dev.slimevr.bridge.ProtobufMessages.internal_static_messages_ProtobufMessage_fieldAccessorTable - .ensureFieldAccessorsInitialized( - dev.slimevr.bridge.ProtobufMessages.ProtobufMessage.class, dev.slimevr.bridge.ProtobufMessages.ProtobufMessage.Builder.class); + .ensureFieldAccessorsInitialized( + dev.slimevr.bridge.ProtobufMessages.ProtobufMessage.class, + dev.slimevr.bridge.ProtobufMessages.ProtobufMessage.Builder.class + ); } @Override - public MessageCase - getMessageCase() { - return MessageCase.forNumber( - messageCase_); + public MessageCase getMessageCase() { + return MessageCase + .forNumber( + messageCase_ + ); } /** @@ -5939,8 +6384,10 @@ public final class ProtobufMessages { @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; - if (isInitialized == 1) return true; - if (isInitialized == 0) return false; + if (isInitialized == 1) + return true; + if (isInitialized == 0) + return false; memoizedIsInitialized = 1; return true; @@ -5948,7 +6395,7 @@ public final class ProtobufMessages { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { + throws java.io.IOException { if (messageCase_ == 1) { output.writeMessage(1, (dev.slimevr.bridge.ProtobufMessages.Position) message_); } @@ -5959,7 +6406,8 @@ public final class ProtobufMessages { output.writeMessage(3, (dev.slimevr.bridge.ProtobufMessages.TrackerAdded) message_); } if (messageCase_ == 4) { - output.writeMessage(4, (dev.slimevr.bridge.ProtobufMessages.TrackerStatus) message_); + output + .writeMessage(4, (dev.slimevr.bridge.ProtobufMessages.TrackerStatus) message_); } unknownFields.writeTo(output); } @@ -5967,24 +6415,34 @@ public final class ProtobufMessages { @java.lang.Override public int getSerializedSize() { int size = memoizedSize; - if (size != -1) return size; + if (size != -1) + return size; size = 0; if (messageCase_ == 1) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, (dev.slimevr.bridge.ProtobufMessages.Position) message_); + .computeMessageSize(1, (dev.slimevr.bridge.ProtobufMessages.Position) message_); } if (messageCase_ == 2) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(2, (dev.slimevr.bridge.ProtobufMessages.UserAction) message_); + .computeMessageSize( + 2, + (dev.slimevr.bridge.ProtobufMessages.UserAction) message_ + ); } if (messageCase_ == 3) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(3, (dev.slimevr.bridge.ProtobufMessages.TrackerAdded) message_); + .computeMessageSize( + 3, + (dev.slimevr.bridge.ProtobufMessages.TrackerAdded) message_ + ); } if (messageCase_ == 4) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(4, (dev.slimevr.bridge.ProtobufMessages.TrackerStatus) message_); + .computeMessageSize( + 4, + (dev.slimevr.bridge.ProtobufMessages.TrackerStatus) message_ + ); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -6001,23 +6459,36 @@ public final class ProtobufMessages { } dev.slimevr.bridge.ProtobufMessages.ProtobufMessage other = (dev.slimevr.bridge.ProtobufMessages.ProtobufMessage) obj; - if (!getMessageCase().equals(other.getMessageCase())) return false; + if (!getMessageCase().equals(other.getMessageCase())) + return false; switch (messageCase_) { case 1: - if (!getPosition() - .equals(other.getPosition())) return false; + if ( + !getPosition() + .equals(other.getPosition()) + ) + return false; break; case 2: - if (!getUserAction() - .equals(other.getUserAction())) return false; + if ( + !getUserAction() + .equals(other.getUserAction()) + ) + return false; break; case 3: - if (!getTrackerAdded() - .equals(other.getTrackerAdded())) return false; + if ( + !getTrackerAdded() + .equals(other.getTrackerAdded()) + ) + return false; break; case 4: - if (!getTrackerStatus() - .equals(other.getTrackerStatus())) return false; + if ( + !getTrackerStatus() + .equals(other.getTrackerStatus()) + ) + return false; break; case 0: default: @@ -6065,12 +6536,14 @@ public final class ProtobufMessages { @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE - ? new Builder() : new Builder().mergeFrom(this); + ? new Builder() + : new Builder().mergeFrom(this); } @java.lang.Override protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + com.google.protobuf.GeneratedMessageV3.BuilderParent parent + ) { Builder builder = new Builder(parent); return builder; } @@ -6086,13 +6559,14 @@ public final class ProtobufMessages { } public enum MessageCase - implements com.google.protobuf.Internal.EnumLite, - com.google.protobuf.AbstractMessage.InternalOneOfEnum { + implements com.google.protobuf.Internal.EnumLite, + com.google.protobuf.AbstractMessage.InternalOneOfEnum { POSITION(1), USER_ACTION(2), TRACKER_ADDED(3), TRACKER_STATUS(4), MESSAGE_NOT_SET(0); + private final int value; MessageCase(int value) { @@ -6136,48 +6610,44 @@ public final class ProtobufMessages { * Protobuf type {@code messages.ProtobufMessage} */ public static final class Builder extends - com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:messages.ProtobufMessage) - dev.slimevr.bridge.ProtobufMessages.ProtobufMessageOrBuilder { + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:messages.ProtobufMessage) + dev.slimevr.bridge.ProtobufMessages.ProtobufMessageOrBuilder { private int messageCase_ = 0; private java.lang.Object message_; - private com.google.protobuf.SingleFieldBuilderV3< - dev.slimevr.bridge.ProtobufMessages.Position, dev.slimevr.bridge.ProtobufMessages.Position.Builder, dev.slimevr.bridge.ProtobufMessages.PositionOrBuilder> positionBuilder_; - private com.google.protobuf.SingleFieldBuilderV3< - dev.slimevr.bridge.ProtobufMessages.UserAction, dev.slimevr.bridge.ProtobufMessages.UserAction.Builder, dev.slimevr.bridge.ProtobufMessages.UserActionOrBuilder> userActionBuilder_; - private com.google.protobuf.SingleFieldBuilderV3< - dev.slimevr.bridge.ProtobufMessages.TrackerAdded, dev.slimevr.bridge.ProtobufMessages.TrackerAdded.Builder, dev.slimevr.bridge.ProtobufMessages.TrackerAddedOrBuilder> trackerAddedBuilder_; - private com.google.protobuf.SingleFieldBuilderV3< - dev.slimevr.bridge.ProtobufMessages.TrackerStatus, dev.slimevr.bridge.ProtobufMessages.TrackerStatus.Builder, dev.slimevr.bridge.ProtobufMessages.TrackerStatusOrBuilder> trackerStatusBuilder_; + private com.google.protobuf.SingleFieldBuilderV3 positionBuilder_; + private com.google.protobuf.SingleFieldBuilderV3 userActionBuilder_; + private com.google.protobuf.SingleFieldBuilderV3 trackerAddedBuilder_; + private com.google.protobuf.SingleFieldBuilderV3 trackerStatusBuilder_; - // Construct using dev.slimevr.bridge.ProtobufMessages.ProtobufMessage.newBuilder() + // Construct using + // dev.slimevr.bridge.ProtobufMessages.ProtobufMessage.newBuilder() private Builder() { maybeForceBuilderInitialization(); } private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + com.google.protobuf.GeneratedMessageV3.BuilderParent parent + ) { super(parent); maybeForceBuilderInitialization(); } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return dev.slimevr.bridge.ProtobufMessages.internal_static_messages_ProtobufMessage_descriptor; } @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return dev.slimevr.bridge.ProtobufMessages.internal_static_messages_ProtobufMessage_fieldAccessorTable - .ensureFieldAccessorsInitialized( - dev.slimevr.bridge.ProtobufMessages.ProtobufMessage.class, dev.slimevr.bridge.ProtobufMessages.ProtobufMessage.Builder.class); + .ensureFieldAccessorsInitialized( + dev.slimevr.bridge.ProtobufMessages.ProtobufMessage.class, + dev.slimevr.bridge.ProtobufMessages.ProtobufMessage.Builder.class + ); } private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } + if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -6189,8 +6659,7 @@ public final class ProtobufMessages { } @java.lang.Override - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return dev.slimevr.bridge.ProtobufMessages.internal_static_messages_ProtobufMessage_descriptor; } @@ -6210,7 +6679,9 @@ public final class ProtobufMessages { @java.lang.Override public dev.slimevr.bridge.ProtobufMessages.ProtobufMessage buildPartial() { - dev.slimevr.bridge.ProtobufMessages.ProtobufMessage result = new dev.slimevr.bridge.ProtobufMessages.ProtobufMessage(this); + dev.slimevr.bridge.ProtobufMessages.ProtobufMessage result = new dev.slimevr.bridge.ProtobufMessages.ProtobufMessage( + this + ); if (messageCase_ == 1) { if (positionBuilder_ == null) { result.message_ = message_; @@ -6251,34 +6722,40 @@ public final class ProtobufMessages { @java.lang.Override public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value + ) { return super.setField(field, value); } @java.lang.Override public Builder clearField( - com.google.protobuf.Descriptors.FieldDescriptor field) { + com.google.protobuf.Descriptors.FieldDescriptor field + ) { return super.clearField(field); } @java.lang.Override public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { + com.google.protobuf.Descriptors.OneofDescriptor oneof + ) { return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, + java.lang.Object value + ) { return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value + ) { return super.addRepeatedField(field, value); } @@ -6293,7 +6770,11 @@ public final class ProtobufMessages { } public Builder mergeFrom(dev.slimevr.bridge.ProtobufMessages.ProtobufMessage other) { - if (other == dev.slimevr.bridge.ProtobufMessages.ProtobufMessage.getDefaultInstance()) return this; + if ( + other + == dev.slimevr.bridge.ProtobufMessages.ProtobufMessage.getDefaultInstance() + ) + return this; switch (other.getMessageCase()) { case POSITION: { mergePosition(other.getPosition()); @@ -6327,14 +6808,16 @@ public final class ProtobufMessages { @java.lang.Override public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry + ) + throws java.io.IOException { dev.slimevr.bridge.ProtobufMessages.ProtobufMessage parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (dev.slimevr.bridge.ProtobufMessages.ProtobufMessage) e.getUnfinishedMessage(); + parsedMessage = (dev.slimevr.bridge.ProtobufMessages.ProtobufMessage) e + .getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -6345,10 +6828,11 @@ public final class ProtobufMessages { } @Override - public MessageCase - getMessageCase() { - return MessageCase.forNumber( - messageCase_); + public MessageCase getMessageCase() { + return MessageCase + .forNumber( + messageCase_ + ); } public Builder clearMessage() { @@ -6409,7 +6893,8 @@ public final class ProtobufMessages { * .messages.Position position = 1; */ public Builder setPosition( - dev.slimevr.bridge.ProtobufMessages.Position.Builder builderForValue) { + dev.slimevr.bridge.ProtobufMessages.Position.Builder builderForValue + ) { if (positionBuilder_ == null) { message_ = builderForValue.build(); onChanged(); @@ -6425,10 +6910,16 @@ public final class ProtobufMessages { */ public Builder mergePosition(dev.slimevr.bridge.ProtobufMessages.Position value) { if (positionBuilder_ == null) { - if (messageCase_ == 1 && - message_ != dev.slimevr.bridge.ProtobufMessages.Position.getDefaultInstance()) { - message_ = dev.slimevr.bridge.ProtobufMessages.Position.newBuilder((dev.slimevr.bridge.ProtobufMessages.Position) message_) - .mergeFrom(value).buildPartial(); + if ( + messageCase_ == 1 + && + message_ + != dev.slimevr.bridge.ProtobufMessages.Position.getDefaultInstance() + ) { + message_ = dev.slimevr.bridge.ProtobufMessages.Position + .newBuilder((dev.slimevr.bridge.ProtobufMessages.Position) message_) + .mergeFrom(value) + .buildPartial(); } else { message_ = value; } @@ -6488,18 +6979,17 @@ public final class ProtobufMessages { /** * .messages.Position position = 1; */ - private com.google.protobuf.SingleFieldBuilderV3< - dev.slimevr.bridge.ProtobufMessages.Position, dev.slimevr.bridge.ProtobufMessages.Position.Builder, dev.slimevr.bridge.ProtobufMessages.PositionOrBuilder> - getPositionFieldBuilder() { + private com.google.protobuf.SingleFieldBuilderV3 getPositionFieldBuilder() { if (positionBuilder_ == null) { if (!(messageCase_ == 1)) { - message_ = dev.slimevr.bridge.ProtobufMessages.Position.getDefaultInstance(); + message_ = dev.slimevr.bridge.ProtobufMessages.Position + .getDefaultInstance(); } - positionBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - dev.slimevr.bridge.ProtobufMessages.Position, dev.slimevr.bridge.ProtobufMessages.Position.Builder, dev.slimevr.bridge.ProtobufMessages.PositionOrBuilder>( - (dev.slimevr.bridge.ProtobufMessages.Position) message_, - getParentForChildren(), - isClean()); + positionBuilder_ = new com.google.protobuf.SingleFieldBuilderV3( + (dev.slimevr.bridge.ProtobufMessages.Position) message_, + getParentForChildren(), + isClean() + ); message_ = null; } messageCase_ = 1; @@ -6558,7 +7048,8 @@ public final class ProtobufMessages { * .messages.UserAction user_action = 2; */ public Builder setUserAction( - dev.slimevr.bridge.ProtobufMessages.UserAction.Builder builderForValue) { + dev.slimevr.bridge.ProtobufMessages.UserAction.Builder builderForValue + ) { if (userActionBuilder_ == null) { message_ = builderForValue.build(); onChanged(); @@ -6574,10 +7065,17 @@ public final class ProtobufMessages { */ public Builder mergeUserAction(dev.slimevr.bridge.ProtobufMessages.UserAction value) { if (userActionBuilder_ == null) { - if (messageCase_ == 2 && - message_ != dev.slimevr.bridge.ProtobufMessages.UserAction.getDefaultInstance()) { - message_ = dev.slimevr.bridge.ProtobufMessages.UserAction.newBuilder((dev.slimevr.bridge.ProtobufMessages.UserAction) message_) - .mergeFrom(value).buildPartial(); + if ( + messageCase_ == 2 + && + message_ + != dev.slimevr.bridge.ProtobufMessages.UserAction + .getDefaultInstance() + ) { + message_ = dev.slimevr.bridge.ProtobufMessages.UserAction + .newBuilder((dev.slimevr.bridge.ProtobufMessages.UserAction) message_) + .mergeFrom(value) + .buildPartial(); } else { message_ = value; } @@ -6637,18 +7135,17 @@ public final class ProtobufMessages { /** * .messages.UserAction user_action = 2; */ - private com.google.protobuf.SingleFieldBuilderV3< - dev.slimevr.bridge.ProtobufMessages.UserAction, dev.slimevr.bridge.ProtobufMessages.UserAction.Builder, dev.slimevr.bridge.ProtobufMessages.UserActionOrBuilder> - getUserActionFieldBuilder() { + private com.google.protobuf.SingleFieldBuilderV3 getUserActionFieldBuilder() { if (userActionBuilder_ == null) { if (!(messageCase_ == 2)) { - message_ = dev.slimevr.bridge.ProtobufMessages.UserAction.getDefaultInstance(); + message_ = dev.slimevr.bridge.ProtobufMessages.UserAction + .getDefaultInstance(); } - userActionBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - dev.slimevr.bridge.ProtobufMessages.UserAction, dev.slimevr.bridge.ProtobufMessages.UserAction.Builder, dev.slimevr.bridge.ProtobufMessages.UserActionOrBuilder>( - (dev.slimevr.bridge.ProtobufMessages.UserAction) message_, - getParentForChildren(), - isClean()); + userActionBuilder_ = new com.google.protobuf.SingleFieldBuilderV3( + (dev.slimevr.bridge.ProtobufMessages.UserAction) message_, + getParentForChildren(), + isClean() + ); message_ = null; } messageCase_ = 2; @@ -6707,7 +7204,8 @@ public final class ProtobufMessages { * .messages.TrackerAdded tracker_added = 3; */ public Builder setTrackerAdded( - dev.slimevr.bridge.ProtobufMessages.TrackerAdded.Builder builderForValue) { + dev.slimevr.bridge.ProtobufMessages.TrackerAdded.Builder builderForValue + ) { if (trackerAddedBuilder_ == null) { message_ = builderForValue.build(); onChanged(); @@ -6721,12 +7219,21 @@ public final class ProtobufMessages { /** * .messages.TrackerAdded tracker_added = 3; */ - public Builder mergeTrackerAdded(dev.slimevr.bridge.ProtobufMessages.TrackerAdded value) { + public Builder mergeTrackerAdded( + dev.slimevr.bridge.ProtobufMessages.TrackerAdded value + ) { if (trackerAddedBuilder_ == null) { - if (messageCase_ == 3 && - message_ != dev.slimevr.bridge.ProtobufMessages.TrackerAdded.getDefaultInstance()) { - message_ = dev.slimevr.bridge.ProtobufMessages.TrackerAdded.newBuilder((dev.slimevr.bridge.ProtobufMessages.TrackerAdded) message_) - .mergeFrom(value).buildPartial(); + if ( + messageCase_ == 3 + && + message_ + != dev.slimevr.bridge.ProtobufMessages.TrackerAdded + .getDefaultInstance() + ) { + message_ = dev.slimevr.bridge.ProtobufMessages.TrackerAdded + .newBuilder((dev.slimevr.bridge.ProtobufMessages.TrackerAdded) message_) + .mergeFrom(value) + .buildPartial(); } else { message_ = value; } @@ -6786,18 +7293,17 @@ public final class ProtobufMessages { /** * .messages.TrackerAdded tracker_added = 3; */ - private com.google.protobuf.SingleFieldBuilderV3< - dev.slimevr.bridge.ProtobufMessages.TrackerAdded, dev.slimevr.bridge.ProtobufMessages.TrackerAdded.Builder, dev.slimevr.bridge.ProtobufMessages.TrackerAddedOrBuilder> - getTrackerAddedFieldBuilder() { + private com.google.protobuf.SingleFieldBuilderV3 getTrackerAddedFieldBuilder() { if (trackerAddedBuilder_ == null) { if (!(messageCase_ == 3)) { - message_ = dev.slimevr.bridge.ProtobufMessages.TrackerAdded.getDefaultInstance(); + message_ = dev.slimevr.bridge.ProtobufMessages.TrackerAdded + .getDefaultInstance(); } - trackerAddedBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - dev.slimevr.bridge.ProtobufMessages.TrackerAdded, dev.slimevr.bridge.ProtobufMessages.TrackerAdded.Builder, dev.slimevr.bridge.ProtobufMessages.TrackerAddedOrBuilder>( - (dev.slimevr.bridge.ProtobufMessages.TrackerAdded) message_, - getParentForChildren(), - isClean()); + trackerAddedBuilder_ = new com.google.protobuf.SingleFieldBuilderV3( + (dev.slimevr.bridge.ProtobufMessages.TrackerAdded) message_, + getParentForChildren(), + isClean() + ); message_ = null; } messageCase_ = 3; @@ -6838,7 +7344,9 @@ public final class ProtobufMessages { /** * .messages.TrackerStatus tracker_status = 4; */ - public Builder setTrackerStatus(dev.slimevr.bridge.ProtobufMessages.TrackerStatus value) { + public Builder setTrackerStatus( + dev.slimevr.bridge.ProtobufMessages.TrackerStatus value + ) { if (trackerStatusBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -6856,7 +7364,8 @@ public final class ProtobufMessages { * .messages.TrackerStatus tracker_status = 4; */ public Builder setTrackerStatus( - dev.slimevr.bridge.ProtobufMessages.TrackerStatus.Builder builderForValue) { + dev.slimevr.bridge.ProtobufMessages.TrackerStatus.Builder builderForValue + ) { if (trackerStatusBuilder_ == null) { message_ = builderForValue.build(); onChanged(); @@ -6870,12 +7379,23 @@ public final class ProtobufMessages { /** * .messages.TrackerStatus tracker_status = 4; */ - public Builder mergeTrackerStatus(dev.slimevr.bridge.ProtobufMessages.TrackerStatus value) { + public Builder mergeTrackerStatus( + dev.slimevr.bridge.ProtobufMessages.TrackerStatus value + ) { if (trackerStatusBuilder_ == null) { - if (messageCase_ == 4 && - message_ != dev.slimevr.bridge.ProtobufMessages.TrackerStatus.getDefaultInstance()) { - message_ = dev.slimevr.bridge.ProtobufMessages.TrackerStatus.newBuilder((dev.slimevr.bridge.ProtobufMessages.TrackerStatus) message_) - .mergeFrom(value).buildPartial(); + if ( + messageCase_ == 4 + && + message_ + != dev.slimevr.bridge.ProtobufMessages.TrackerStatus + .getDefaultInstance() + ) { + message_ = dev.slimevr.bridge.ProtobufMessages.TrackerStatus + .newBuilder( + (dev.slimevr.bridge.ProtobufMessages.TrackerStatus) message_ + ) + .mergeFrom(value) + .buildPartial(); } else { message_ = value; } @@ -6935,18 +7455,17 @@ public final class ProtobufMessages { /** * .messages.TrackerStatus tracker_status = 4; */ - private com.google.protobuf.SingleFieldBuilderV3< - dev.slimevr.bridge.ProtobufMessages.TrackerStatus, dev.slimevr.bridge.ProtobufMessages.TrackerStatus.Builder, dev.slimevr.bridge.ProtobufMessages.TrackerStatusOrBuilder> - getTrackerStatusFieldBuilder() { + private com.google.protobuf.SingleFieldBuilderV3 getTrackerStatusFieldBuilder() { if (trackerStatusBuilder_ == null) { if (!(messageCase_ == 4)) { - message_ = dev.slimevr.bridge.ProtobufMessages.TrackerStatus.getDefaultInstance(); + message_ = dev.slimevr.bridge.ProtobufMessages.TrackerStatus + .getDefaultInstance(); } - trackerStatusBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - dev.slimevr.bridge.ProtobufMessages.TrackerStatus, dev.slimevr.bridge.ProtobufMessages.TrackerStatus.Builder, dev.slimevr.bridge.ProtobufMessages.TrackerStatusOrBuilder>( - (dev.slimevr.bridge.ProtobufMessages.TrackerStatus) message_, - getParentForChildren(), - isClean()); + trackerStatusBuilder_ = new com.google.protobuf.SingleFieldBuilderV3( + (dev.slimevr.bridge.ProtobufMessages.TrackerStatus) message_, + getParentForChildren(), + isClean() + ); message_ = null; } messageCase_ = 4; @@ -6956,13 +7475,15 @@ public final class ProtobufMessages { @java.lang.Override public final Builder setUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { + final com.google.protobuf.UnknownFieldSet unknownFields + ) { return super.setUnknownFields(unknownFields); } @java.lang.Override public final Builder mergeUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { + final com.google.protobuf.UnknownFieldSet unknownFields + ) { return super.mergeUnknownFields(unknownFields); } diff --git a/src/main/java/dev/slimevr/bridge/VMCBridge.java b/src/main/java/dev/slimevr/bridge/VMCBridge.java index b8cab2e5b..aa70192e8 100644 --- a/src/main/java/dev/slimevr/bridge/VMCBridge.java +++ b/src/main/java/dev/slimevr/bridge/VMCBridge.java @@ -4,6 +4,7 @@ import dev.slimevr.vr.trackers.ShareableTracker; import java.net.InetAddress; + public class VMCBridge extends Thread implements Bridge { public final int readPort; diff --git a/src/main/java/dev/slimevr/gui/AbstractComponentListener.java b/src/main/java/dev/slimevr/gui/AbstractComponentListener.java index a5043c9dc..b682fb346 100644 --- a/src/main/java/dev/slimevr/gui/AbstractComponentListener.java +++ b/src/main/java/dev/slimevr/gui/AbstractComponentListener.java @@ -3,6 +3,7 @@ package dev.slimevr.gui; import java.awt.event.ComponentEvent; import java.awt.event.ComponentListener; + public abstract class AbstractComponentListener implements ComponentListener { @Override diff --git a/src/main/java/dev/slimevr/gui/AbstractWindowListener.java b/src/main/java/dev/slimevr/gui/AbstractWindowListener.java index 2bd9ce54d..b6dd41fac 100644 --- a/src/main/java/dev/slimevr/gui/AbstractWindowListener.java +++ b/src/main/java/dev/slimevr/gui/AbstractWindowListener.java @@ -3,6 +3,7 @@ package dev.slimevr.gui; import java.awt.event.WindowEvent; import java.awt.event.WindowListener; + public abstract class AbstractWindowListener implements WindowListener { @Override diff --git a/src/main/java/dev/slimevr/gui/AutoBoneWindow.java b/src/main/java/dev/slimevr/gui/AutoBoneWindow.java index 487c55fbb..5cab375a7 100644 --- a/src/main/java/dev/slimevr/gui/AutoBoneWindow.java +++ b/src/main/java/dev/slimevr/gui/AutoBoneWindow.java @@ -19,6 +19,7 @@ import java.awt.event.MouseEvent; import java.util.List; import java.util.concurrent.Future; + public class AutoBoneWindow extends JFrame { private final transient VRServer server; @@ -46,16 +47,23 @@ public class AutoBoneWindow extends JFrame { this.autoBone = new AutoBone(server); getContentPane().setLayout(new BoxLayout(getContentPane(), BoxLayout.PAGE_AXIS)); - add(new JScrollPane(pane = new EJBox(BoxLayout.PAGE_AXIS), ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED)); + add( + new JScrollPane( + pane = new EJBox(BoxLayout.PAGE_AXIS), + ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, + ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED + ) + ); build(); } private float processFrames(PoseFrames frames) { - return autoBone.processFrames(frames, autoBone.calcInitError, autoBone.targetHeight, (epoch) -> { - processLabel.setText(epoch.toString()); - lengthsLabel.setText(autoBone.getLengthsString()); - }); + return autoBone + .processFrames(frames, autoBone.calcInitError, autoBone.targetHeight, (epoch) -> { + processLabel.setText(epoch.toString()); + lengthsLabel.setText(autoBone.getLengthsString()); + }); } @AWTThread @@ -79,31 +87,46 @@ public class AutoBoneWindow extends JFrame { try { if (poseRecorder.isReadyToRecord()) { setText("Recording..."); - // 1000 samples at 20 ms per sample is 20 seconds - int sampleCount = server.config.getInt("autobone.sampleCount", 1000); - long sampleRate = server.config.getLong("autobone.sampleRateMs", 20L); - Future framesFuture = poseRecorder.startFrameRecording(sampleCount, sampleRate); + // 1000 samples at 20 ms per + // sample is + // 20 seconds + int sampleCount = server.config + .getInt("autobone.sampleCount", 1000); + long sampleRate = server.config + .getLong("autobone.sampleRateMs", 20L); + Future framesFuture = poseRecorder + .startFrameRecording(sampleCount, sampleRate); PoseFrames frames = framesFuture.get(); - LogManager.log.info("[AutoBone] Done recording!"); + LogManager.info("[AutoBone] Done recording!"); saveRecordingButton.setEnabled(true); adjustButton.setEnabled(true); - if (server.config.getBoolean("autobone.saveRecordings", false)) { + if ( + server.config + .getBoolean( + "autobone.saveRecordings", + false + ) + ) { setText("Saving..."); autoBone.saveRecording(frames); } } else { setText("Not Ready..."); - LogManager.log.severe("[AutoBone] Unable to record..."); - Thread.sleep(3000); // Wait for 3 seconds + LogManager.severe("[AutoBone] Unable to record..."); + Thread.sleep(3000); // Wait for + // 3 + // seconds return; } } catch (Exception e) { setText("Recording Failed..."); - LogManager.log.severe("[AutoBone] Failed recording!", e); + LogManager.severe("[AutoBone] Failed recording!", e); try { - Thread.sleep(3000); // Wait for 3 seconds + Thread.sleep(3000); // Wait for + // 3 + // seconds } catch (Exception e1) { // Ignore } @@ -136,17 +159,22 @@ public class AutoBoneWindow extends JFrame { @Override public void run() { try { - Future framesFuture = poseRecorder.getFramesAsync(); + Future framesFuture = poseRecorder + .getFramesAsync(); if (framesFuture != null) { setText("Waiting for Recording..."); PoseFrames frames = framesFuture.get(); if (frames.getTrackerCount() <= 0) { - throw new IllegalStateException("Recording has no trackers"); + throw new IllegalStateException( + "Recording has no trackers" + ); } if (frames.getMaxFrameCount() <= 0) { - throw new IllegalStateException("Recording has no frames"); + throw new IllegalStateException( + "Recording has no frames" + ); } setText("Saving..."); @@ -154,15 +182,22 @@ public class AutoBoneWindow extends JFrame { setText("Recording Saved!"); try { - Thread.sleep(3000); // Wait for 3 seconds + Thread.sleep(3000); // Wait + // for 3 + // seconds } catch (Exception e1) { // Ignore } } else { setText("No Recording..."); - LogManager.log.severe("[AutoBone] Unable to save, no recording was done..."); + LogManager + .severe( + "[AutoBone] Unable to save, no recording was done..." + ); try { - Thread.sleep(3000); // Wait for 3 seconds + Thread.sleep(3000); // Wait + // for 3 + // seconds } catch (Exception e1) { // Ignore } @@ -170,9 +205,12 @@ public class AutoBoneWindow extends JFrame { } } catch (Exception e) { setText("Saving Failed..."); - LogManager.log.severe("[AutoBone] Failed to save recording!", e); + LogManager + .severe("[AutoBone] Failed to save recording!", e); try { - Thread.sleep(3000); // Wait for 3 seconds + Thread.sleep(3000); // Wait for + // 3 + // seconds } catch (Exception e1) { // Ignore } @@ -193,7 +231,11 @@ public class AutoBoneWindow extends JFrame { add(adjustButton = new JButton("Auto-Adjust") { { // If there are files to load, enable the button - setEnabled(poseRecorder.hasRecording() || (AutoBone.getLoadDir().isDirectory() && AutoBone.getLoadDir().list().length > 0)); + setEnabled( + poseRecorder.hasRecording() + || (AutoBone.getLoadDir().isDirectory() + && AutoBone.getLoadDir().list().length > 0) + ); addMouseListener(new MouseInputAdapter() { @Override public void mouseClicked(MouseEvent e) { @@ -207,30 +249,44 @@ public class AutoBoneWindow extends JFrame { public void run() { try { setText("Load..."); - List> frameRecordings = autoBone.loadRecordings(); + List> frameRecordings = autoBone + .loadRecordings(); if (!frameRecordings.isEmpty()) { - LogManager.log.info("[AutoBone] Done loading frames!"); + LogManager.info("[AutoBone] Done loading frames!"); } else { - Future framesFuture = poseRecorder.getFramesAsync(); + Future framesFuture = poseRecorder + .getFramesAsync(); if (framesFuture != null) { setText("Waiting for Recording..."); PoseFrames frames = framesFuture.get(); if (frames.getTrackerCount() <= 0) { - throw new IllegalStateException("Recording has no trackers"); + throw new IllegalStateException( + "Recording has no trackers" + ); } if (frames.getMaxFrameCount() <= 0) { - throw new IllegalStateException("Recording has no frames"); + throw new IllegalStateException( + "Recording has no frames" + ); } - frameRecordings.add(Pair.of("", frames)); + frameRecordings + .add(Pair.of("", frames)); } else { setText("No Recordings..."); - LogManager.log.severe("[AutoBone] No recordings found in \"" + AutoBone.getLoadDir().getPath() + "\" and no recording was done..."); + LogManager + .severe( + "[AutoBone] No recordings found in \"" + + AutoBone.getLoadDir().getPath() + + "\" and no recording was done..." + ); try { - Thread.sleep(3000); // Wait for 3 seconds + Thread.sleep(3000); // Wait + // for 3 + // seconds } catch (Exception e1) { // Ignore } @@ -239,34 +295,93 @@ public class AutoBoneWindow extends JFrame { } setText("Processing..."); - LogManager.log.info("[AutoBone] Processing frames..."); - FastList heightPercentError = new FastList(frameRecordings.size()); - for (Pair recording : frameRecordings) { - LogManager.log.info("[AutoBone] Processing frames from \"" + recording.getKey() + "\"..."); + LogManager.info("[AutoBone] Processing frames..."); + FastList heightPercentError = new FastList( + frameRecordings.size() + ); + for ( + Pair recording : frameRecordings + ) { + LogManager + .info( + "[AutoBone] Processing frames from \"" + + recording.getKey() + + "\"..." + ); - heightPercentError.add(processFrames(recording.getValue())); - LogManager.log.info("[AutoBone] Done processing!"); + heightPercentError + .add(processFrames(recording.getValue())); + LogManager.info("[AutoBone] Done processing!"); applyButton.setEnabled(true); - //#region Stats/Values - Float neckLength = autoBone.getConfig(SkeletonConfigValue.NECK); - Float chestDistance = autoBone.getConfig(SkeletonConfigValue.CHEST); - Float torsoLength = autoBone.getConfig(SkeletonConfigValue.TORSO); - Float hipWidth = autoBone.getConfig(SkeletonConfigValue.HIPS_WIDTH); - Float legsLength = autoBone.getConfig(SkeletonConfigValue.LEGS_LENGTH); - Float kneeHeight = autoBone.getConfig(SkeletonConfigValue.KNEE_HEIGHT); + // #region Stats/Values + Float neckLength = autoBone + .getConfig(SkeletonConfigValue.NECK); + Float chestDistance = autoBone + .getConfig(SkeletonConfigValue.CHEST); + Float torsoLength = autoBone + .getConfig(SkeletonConfigValue.TORSO); + Float hipWidth = autoBone + .getConfig(SkeletonConfigValue.HIPS_WIDTH); + Float legsLength = autoBone + .getConfig(SkeletonConfigValue.LEGS_LENGTH); + Float kneeHeight = autoBone + .getConfig(SkeletonConfigValue.KNEE_HEIGHT); - float neckTorso = neckLength != null && torsoLength != null ? neckLength / torsoLength : 0f; - float chestTorso = chestDistance != null && torsoLength != null ? chestDistance / torsoLength : 0f; - float torsoWaist = hipWidth != null && torsoLength != null ? hipWidth / torsoLength : 0f; - float legTorso = legsLength != null && torsoLength != null ? legsLength / torsoLength : 0f; - float legBody = legsLength != null && torsoLength != null && neckLength != null ? legsLength / (torsoLength + neckLength) : 0f; - float kneeLeg = kneeHeight != null && legsLength != null ? kneeHeight / legsLength : 0f; + float neckTorso = neckLength != null + && torsoLength != null + ? neckLength + / torsoLength + : 0f; + float chestTorso = chestDistance != null + && torsoLength != null + ? chestDistance + / torsoLength + : 0f; + float torsoWaist = hipWidth != null + && torsoLength != null + ? hipWidth + / torsoLength + : 0f; + float legTorso = legsLength != null + && torsoLength != null + ? legsLength + / torsoLength + : 0f; + float legBody = legsLength != null + && torsoLength != null + && neckLength != null + ? legsLength + / (torsoLength + neckLength) + : 0f; + float kneeLeg = kneeHeight != null + && legsLength != null + ? kneeHeight + / legsLength + : 0f; - LogManager.log.info("[AutoBone] Ratios: [{Neck-Torso: " + StringUtils.prettyNumber(neckTorso) + "}, {Chest-Torso: " + StringUtils.prettyNumber(chestTorso) + "}, {Torso-Waist: " + StringUtils.prettyNumber(torsoWaist) + "}, {Leg-Torso: " + StringUtils.prettyNumber(legTorso) + "}, {Leg-Body: " + StringUtils.prettyNumber(legBody) + "}, {Knee-Leg: " + StringUtils.prettyNumber(kneeLeg) + "}]"); + LogManager + .info( + "[AutoBone] Ratios: [{Neck-Torso: " + + StringUtils.prettyNumber(neckTorso) + + "}, {Chest-Torso: " + + StringUtils.prettyNumber(chestTorso) + + "}, {Torso-Waist: " + + StringUtils.prettyNumber(torsoWaist) + + "}, {Leg-Torso: " + + StringUtils.prettyNumber(legTorso) + + "}, {Leg-Body: " + + StringUtils.prettyNumber(legBody) + + "}, {Knee-Leg: " + + StringUtils.prettyNumber(kneeLeg) + + "}]" + ); String lengthsString = autoBone.getLengthsString(); - LogManager.log.info("[AutoBone] Length values: " + lengthsString); + LogManager + .info( + "[AutoBone] Length values: " + lengthsString + ); lengthsLabel.setText(lengthsString); } @@ -282,16 +397,26 @@ public class AutoBoneWindow extends JFrame { float stdVal = val - mean; std += stdVal * stdVal; } - std = (float) Math.sqrt(std / heightPercentError.size()); + std = (float) Math + .sqrt(std / heightPercentError.size()); - LogManager.log.info("[AutoBone] Average height error: " + StringUtils.prettyNumber(mean, 6) + " (SD " + StringUtils.prettyNumber(std, 6) + ")"); + LogManager + .info( + "[AutoBone] Average height error: " + + StringUtils.prettyNumber(mean, 6) + + " (SD " + + StringUtils.prettyNumber(std, 6) + + ")" + ); } - //#endregion + // #endregion } catch (Exception e) { setText("Failed..."); - LogManager.log.severe("[AutoBone] Failed adjustment!", e); + LogManager.severe("[AutoBone] Failed adjustment!", e); try { - Thread.sleep(3000); // Wait for 3 seconds + Thread.sleep(3000); // Wait for + // 3 + // seconds } catch (Exception e1) { // Ignore } diff --git a/src/main/java/dev/slimevr/gui/CalibrationWindow.java b/src/main/java/dev/slimevr/gui/CalibrationWindow.java index da6bcb73f..9283fe853 100644 --- a/src/main/java/dev/slimevr/gui/CalibrationWindow.java +++ b/src/main/java/dev/slimevr/gui/CalibrationWindow.java @@ -11,6 +11,7 @@ import javax.swing.event.MouseInputAdapter; import java.awt.*; import java.awt.event.MouseEvent; + public class CalibrationWindow extends JFrame { public final Tracker tracker; @@ -45,28 +46,36 @@ public class CalibrationWindow extends JFrame { private void build() { Container pane = getContentPane(); - pane.add(calibrateButton = new JButton("Calibrate") {{ - addMouseListener(new MouseInputAdapter() { - @Override - public void mouseClicked(MouseEvent e) { - calibrateButton.setText("Calibrating..."); - ((CalibratingTracker) tracker).startCalibration(CalibrationWindow.this::newCalibrationReceived); - } - }); - }}); + pane.add(calibrateButton = new JButton("Calibrate") { + { + addMouseListener(new MouseInputAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + calibrateButton.setText("Calibrating..."); + ((CalibratingTracker) tracker) + .startCalibration(CalibrationWindow.this::newCalibrationReceived); + } + }); + } + }); - pane.add(new EJBox(BoxLayout.PAGE_AXIS) {{ - setBorder(new EmptyBorder(i(5))); - add(new JLabel("Current calibration")); - add(currentCalibration = new JTextArea(10, 25)); + pane.add(new EJBox(BoxLayout.PAGE_AXIS) { + { + setBorder(new EmptyBorder(i(5))); + add(new JLabel("Current calibration")); + add(currentCalibration = new JTextArea(10, 25)); - ((CalibratingTracker) tracker).requestCalibrationData(CalibrationWindow.this::currentCalibrationReceived); - }}); - pane.add(new EJBox(BoxLayout.PAGE_AXIS) {{ - setBorder(new EmptyBorder(i(5))); - add(new JLabel("New calibration")); - add(newCalibration = new JTextArea(10, 25)); - }}); + ((CalibratingTracker) tracker) + .requestCalibrationData(CalibrationWindow.this::currentCalibrationReceived); + } + }); + pane.add(new EJBox(BoxLayout.PAGE_AXIS) { + { + setBorder(new EmptyBorder(i(5))); + add(new JLabel("New calibration")); + add(newCalibration = new JTextArea(10, 25)); + } + }); // Pack and display pack(); diff --git a/src/main/java/dev/slimevr/gui/Keybinding.java b/src/main/java/dev/slimevr/gui/Keybinding.java index 1a0388f7e..7e70b3425 100644 --- a/src/main/java/dev/slimevr/gui/Keybinding.java +++ b/src/main/java/dev/slimevr/gui/Keybinding.java @@ -7,6 +7,7 @@ import io.eiren.util.OperatingSystem; import io.eiren.util.ann.AWTThread; import io.eiren.util.logging.LogManager; + public class Keybinding implements HotkeyListener { private static final int RESET = 1; private static final int QUICK_RESET = 2; @@ -17,7 +18,10 @@ public class Keybinding implements HotkeyListener { this.server = server; if (OperatingSystem.getCurrentPlatform() != OperatingSystem.WINDOWS) { - LogManager.log.info("[Keybinding] Currently only supported on Windows. Keybindings will be disabled."); + LogManager + .info( + "[Keybinding] Currently only supported on Windows. Keybindings will be disabled." + ); return; } @@ -31,7 +35,7 @@ public class Keybinding implements HotkeyListener { this.server.config.setProperty("keybindings.reset", resetBinding); } JIntellitype.getInstance().registerHotKey(RESET, resetBinding); - LogManager.log.info("[Keybinding] Bound reset to " + resetBinding); + LogManager.info("[Keybinding] Bound reset to " + resetBinding); String quickResetBinding = this.server.config.getString("keybindings.quickReset"); if (quickResetBinding == null) { @@ -39,10 +43,13 @@ public class Keybinding implements HotkeyListener { this.server.config.setProperty("keybindings.quickReset", quickResetBinding); } JIntellitype.getInstance().registerHotKey(QUICK_RESET, quickResetBinding); - LogManager.log.info("[Keybinding] Bound quick reset to " + quickResetBinding); + LogManager.info("[Keybinding] Bound quick reset to " + quickResetBinding); } } catch (Throwable e) { - LogManager.log.info("[Keybinding] JIntellitype initialization failed. Keybindings will be disabled. Try restarting your computer."); + LogManager + .info( + "[Keybinding] JIntellitype initialization failed. Keybindings will be disabled. Try restarting your computer." + ); } } @@ -51,11 +58,11 @@ public class Keybinding implements HotkeyListener { public void onHotKey(int identifier) { switch (identifier) { case RESET: - LogManager.log.info("[Keybinding] Reset pressed"); + LogManager.info("[Keybinding] Reset pressed"); server.resetTrackers(); break; case QUICK_RESET: - LogManager.log.info("[Keybinding] Quick reset pressed"); + LogManager.info("[Keybinding] Quick reset pressed"); server.resetTrackersYaw(); break; } diff --git a/src/main/java/dev/slimevr/gui/ScalableFont.java b/src/main/java/dev/slimevr/gui/ScalableFont.java index 38cfa9d10..c8f1009d3 100644 --- a/src/main/java/dev/slimevr/gui/ScalableFont.java +++ b/src/main/java/dev/slimevr/gui/ScalableFont.java @@ -4,6 +4,7 @@ import java.awt.*; import java.text.AttributedCharacterIterator.Attribute; import java.util.Map; + public class ScalableFont extends Font { protected float scale = 1.0f; diff --git a/src/main/java/dev/slimevr/gui/SkeletonConfigGUI.java b/src/main/java/dev/slimevr/gui/SkeletonConfigGUI.java index e4fa36568..9a0d79786 100644 --- a/src/main/java/dev/slimevr/gui/SkeletonConfigGUI.java +++ b/src/main/java/dev/slimevr/gui/SkeletonConfigGUI.java @@ -14,6 +14,7 @@ import java.awt.event.MouseEvent; import java.util.HashMap; import java.util.Map; + public class SkeletonConfigGUI extends EJBagNoStretch { private final VRServer server; @@ -40,66 +41,18 @@ public class SkeletonConfigGUI extends EJBagNoStretch { int row = 0; - /** - add(new JCheckBox("Extended pelvis model") {{ - addItemListener(new ItemListener() { - @Override public void itemStateChanged(ItemEvent e) { - if(e.getStateChange() == ItemEvent.SELECTED) {//checkbox has been selected - if(newSkeleton != null && newSkeleton instanceof HumanSkeletonWithLegs) { - HumanSkeletonWithLegs hswl = (HumanSkeletonWithLegs) newSkeleton; - hswl.setSkeletonConfigBoolean("Extended pelvis model", true); - } - } else { - if(newSkeleton != null && newSkeleton instanceof HumanSkeletonWithLegs) { - HumanSkeletonWithLegs hswl = (HumanSkeletonWithLegs) newSkeleton; - hswl.setSkeletonConfigBoolean("Extended pelvis model", false); - } - } - } - }); - if(newSkeleton != null && newSkeleton instanceof HumanSkeletonWithLegs) { - HumanSkeletonWithLegs hswl = (HumanSkeletonWithLegs) newSkeleton; - setSelected(hswl.getSkeletonConfigBoolean("Extended pelvis model")); - } - }}, s(c(0, row, 2), 3, 1)); - row++; - //*/ - /* - add(new JCheckBox("Extended knee model") {{ - addItemListener(new ItemListener() { - @Override - public void itemStateChanged(ItemEvent e) { - if(e.getStateChange() == ItemEvent.SELECTED) {//checkbox has been selected - if(newSkeleton != null && newSkeleton instanceof HumanSkeletonWithLegs) { - HumanSkeletonWithLegs hswl = (HumanSkeletonWithLegs) newSkeleton; - hswl.setSkeletonConfigBoolean("Extended knee model", true); - } - } else { - if(newSkeleton != null && newSkeleton instanceof HumanSkeletonWithLegs) { - HumanSkeletonWithLegs hswl = (HumanSkeletonWithLegs) newSkeleton; - hswl.setSkeletonConfigBoolean("Extended knee model", false); - } - } - } - }); - if(newSkeleton != null && newSkeleton instanceof HumanSkeletonWithLegs) { - HumanSkeletonWithLegs hswl = (HumanSkeletonWithLegs) newSkeleton; - setSelected(hswl.getSkeletonConfigBoolean("Extended knee model")); - } - }}, s(c(0, row, 2), 3, 1)); - row++; - //*/ - add(new TimedResetButton("Reset All"), s(c(1, row, 2), 3, 1)); - add(new JButton("Auto") {{ - addMouseListener(new MouseInputAdapter() { - @Override - public void mouseClicked(MouseEvent e) { - autoBone.setVisible(true); - autoBone.toFront(); - } - }); - }}, s(c(4, row, 2), 3, 1)); + add(new JButton("Auto") { + { + addMouseListener(new MouseInputAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + autoBone.setVisible(true); + autoBone.toFront(); + } + }); + } + }, s(c(4, row, 2), 3, 1)); add(precisionCb = new JCheckBox("Precision adjust"), c(0, row, 2)); precisionCb.setSelected(false); @@ -112,7 +65,8 @@ public class SkeletonConfigGUI extends EJBagNoStretch { add(new SkeletonLabel(config), c(2, row, 2)); add(new AdjButton("-", config, true), c(3, row, 2)); - // Only use a timer on configs that need time to get into position for + // Only use a timer on configs that need time to get into + // position for switch (config) { case TORSO: case LEGS_LENGTH: @@ -132,13 +86,20 @@ public class SkeletonConfigGUI extends EJBagNoStretch { float proportionsIncrement(Boolean negative) { float increment = 0.01f; - if (negative) increment = -0.01f; - if (precisionCb.isSelected()) increment /= 2f; + if (negative) + increment = -0.01f; + if (precisionCb.isSelected()) + increment /= 2f; return increment; } - String getBoneLengthString(SkeletonConfigValue joint) { // Rounded to the nearest 0.5 - return (StringUtils.prettyNumber(Math.round(server.humanPoseProcessor.getSkeletonConfig(joint) * 200) / 2.0f, 1)); + String getBoneLengthString(SkeletonConfigValue joint) { // Rounded to the + // nearest 0.5 + return (StringUtils + .prettyNumber( + Math.round(server.humanPoseProcessor.getSkeletonConfig(joint) * 200) / 2.0f, + 1 + )); } @ThreadSafe diff --git a/src/main/java/dev/slimevr/gui/SkeletonList.java b/src/main/java/dev/slimevr/gui/SkeletonList.java index f7451a444..0bbeaf7b2 100644 --- a/src/main/java/dev/slimevr/gui/SkeletonList.java +++ b/src/main/java/dev/slimevr/gui/SkeletonList.java @@ -16,6 +16,7 @@ import javax.swing.*; import java.awt.*; import java.util.List; + public class SkeletonList extends EJBagNoStretch { private static final long UPDATE_DELAY = 50; diff --git a/src/main/java/dev/slimevr/gui/TrackersFiltersGUI.java b/src/main/java/dev/slimevr/gui/TrackersFiltersGUI.java index 0637dfd72..531ff11fe 100644 --- a/src/main/java/dev/slimevr/gui/TrackersFiltersGUI.java +++ b/src/main/java/dev/slimevr/gui/TrackersFiltersGUI.java @@ -12,6 +12,7 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.MouseEvent; + public class TrackersFiltersGUI extends EJBagNoStretch { private final VRServer server; @@ -54,7 +55,10 @@ public class TrackersFiltersGUI extends EJBagNoStretch { add(new JLabel("Intensity"), c(0, row, 2)); add(new AdjButton("+", 0, false), c(1, row, 2)); - add(amountLabel = new JLabel(StringUtils.prettyNumber(filterAmount * 100f) + "%"), c(2, row, 2)); + add( + amountLabel = new JLabel(StringUtils.prettyNumber(filterAmount * 100f) + "%"), + c(2, row, 2) + ); add(new AdjButton("-", 0, true), c(3, row, 2)); row++; filterTicks = (int) FastMath.clamp(server.config.getInt("filters.tickCount", 1), 0, 80); diff --git a/src/main/java/dev/slimevr/gui/TrackersList.java b/src/main/java/dev/slimevr/gui/TrackersList.java index 344f4b755..633f0afb0 100644 --- a/src/main/java/dev/slimevr/gui/TrackersList.java +++ b/src/main/java/dev/slimevr/gui/TrackersList.java @@ -19,6 +19,7 @@ import java.awt.event.ActionListener; import java.util.List; import java.util.Objects; + public class TrackersList extends EJBoxNoStretch { private static final long UPDATE_DELAY = 50; @@ -166,14 +167,20 @@ public class TrackersList extends EJBoxNoStretch { realTracker = ((ReferenceAdjustedTracker) t).getTracker(); removeAll(); JLabel nameLabel; - add(nameLabel = new JLabel(t.getDescriptiveName()), s(c(0, row, 2, GridBagConstraints.FIRST_LINE_START), 4, 1)); + add( + nameLabel = new JLabel(t.getDescriptiveName()), + s(c(0, row, 2, GridBagConstraints.FIRST_LINE_START), 4, 1) + ); nameLabel.setFont(nameLabel.getFont().deriveFont(Font.BOLD)); row++; if (t.userEditable()) { TrackerConfig cfg = server.getTrackerConfig(t); JComboBox desSelect; - add(desSelect = new JComboBox<>(), s(c(0, row, 2, GridBagConstraints.FIRST_LINE_START), 2, 1)); + add( + desSelect = new JComboBox<>(), + s(c(0, row, 2, GridBagConstraints.FIRST_LINE_START), 2, 1) + ); for (TrackerPosition p : TrackerPosition.values) { desSelect.addItem(p.name()); } @@ -185,7 +192,8 @@ public class TrackersList extends EJBoxNoStretch { desSelect.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - TrackerPosition p = TrackerPosition.valueOf(String.valueOf(desSelect.getSelectedItem())); + TrackerPosition p = TrackerPosition + .valueOf(String.valueOf(desSelect.getSelectedItem())); t.setBodyPosition(p); server.trackerUpdated(t); } @@ -193,17 +201,27 @@ public class TrackersList extends EJBoxNoStretch { if (realTracker instanceof IMUTracker) { IMUTracker imu = (IMUTracker) realTracker; JComboBox mountSelect; - add(mountSelect = new JComboBox<>(), s(c(2, row, 2, GridBagConstraints.FIRST_LINE_START), 2, 1)); + add( + mountSelect = new JComboBox<>(), + s(c(2, row, 2, GridBagConstraints.FIRST_LINE_START), 2, 1) + ); for (TrackerMountingRotation p : TrackerMountingRotation.values) { mountSelect.addItem(p.name()); } - TrackerMountingRotation selected = TrackerMountingRotation.fromQuaternion(imu.getMountingRotation()); - mountSelect.setSelectedItem(Objects.requireNonNullElse(selected, TrackerMountingRotation.BACK).name()); + TrackerMountingRotation selected = TrackerMountingRotation + .fromQuaternion(imu.getMountingRotation()); + mountSelect + .setSelectedItem( + Objects + .requireNonNullElse(selected, TrackerMountingRotation.BACK) + .name() + ); mountSelect.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - TrackerMountingRotation tr = TrackerMountingRotation.valueOf(String.valueOf(mountSelect.getSelectedItem())); + TrackerMountingRotation tr = TrackerMountingRotation + .valueOf(String.valueOf(mountSelect.getSelectedItem())); imu.setMountingRotation(tr.quaternion); server.trackerUpdated(t); } @@ -222,12 +240,21 @@ public class TrackersList extends EJBoxNoStretch { } row++; if (t.hasRotation()) - add(rotation = new JLabel("0 0 0"), c(0, row, 2, GridBagConstraints.FIRST_LINE_START)); + add( + rotation = new JLabel("0 0 0"), + c(0, row, 2, GridBagConstraints.FIRST_LINE_START) + ); if (t.hasPosition()) - add(position = new JLabel("0 0 0"), c(1, row, 2, GridBagConstraints.FIRST_LINE_START)); + add( + position = new JLabel("0 0 0"), + c(1, row, 2, GridBagConstraints.FIRST_LINE_START) + ); if (realTracker instanceof IMUTracker) { add(ping = new JLabel(""), c(2, row, 2, GridBagConstraints.FIRST_LINE_START)); - add(signalStrength = new JLabel(""), c(4, row, 2, GridBagConstraints.FIRST_LINE_START)); + add( + signalStrength = new JLabel(""), + c(4, row, 2, GridBagConstraints.FIRST_LINE_START) + ); } if (realTracker instanceof TrackerWithTPS) { add(tps = new JLabel("0"), c(3, row, 2, GridBagConstraints.FIRST_LINE_START)); @@ -236,14 +263,20 @@ public class TrackersList extends EJBoxNoStretch { } row++; add(new JLabel("Status:"), c(0, row, 2, GridBagConstraints.FIRST_LINE_START)); - add(status = new JLabel(t.getStatus().toString().toLowerCase()), c(1, row, 2, GridBagConstraints.FIRST_LINE_START)); + add( + status = new JLabel(t.getStatus().toString().toLowerCase()), + c(1, row, 2, GridBagConstraints.FIRST_LINE_START) + ); if (realTracker instanceof TrackerWithBattery) { add(new JLabel("Battery:"), c(2, row, 2, GridBagConstraints.FIRST_LINE_START)); add(bat = new JLabel("0"), c(3, row, 2, GridBagConstraints.FIRST_LINE_START)); } row++; add(new JLabel("Raw:"), c(0, row, 2, GridBagConstraints.FIRST_LINE_START)); - add(raw = new JLabel("0 0 0"), s(c(1, row, 2, GridBagConstraints.FIRST_LINE_START), 3, 1)); + add( + raw = new JLabel("0 0 0"), + s(c(1, row, 2, GridBagConstraints.FIRST_LINE_START), 3, 1) + ); if (debug && realTracker instanceof IMUTracker) { add(new JLabel("Quat:"), c(2, row, 2, GridBagConstraints.FIRST_LINE_START)); @@ -253,17 +286,32 @@ public class TrackersList extends EJBoxNoStretch { if (debug && realTracker instanceof IMUTracker) { add(new JLabel("Raw mag:"), c(0, row, 2, GridBagConstraints.FIRST_LINE_START)); - add(rawMag = new JLabel("0 0 0"), s(c(1, row, 2, GridBagConstraints.FIRST_LINE_START), 3, 1)); + add( + rawMag = new JLabel("0 0 0"), + s(c(1, row, 2, GridBagConstraints.FIRST_LINE_START), 3, 1) + ); add(new JLabel("Gyro fix:"), c(2, row, 2, GridBagConstraints.FIRST_LINE_START)); - add(new JLabel(String.format("0x%8x", realTracker.hashCode())), s(c(3, row, 2, GridBagConstraints.FIRST_LINE_START), 3, 1)); + add( + new JLabel(String.format("0x%8x", realTracker.hashCode())), + s(c(3, row, 2, GridBagConstraints.FIRST_LINE_START), 3, 1) + ); row++; add(new JLabel("Cal:"), c(0, row, 2, GridBagConstraints.FIRST_LINE_START)); - add(calibration = new JLabel("0"), c(1, row, 2, GridBagConstraints.FIRST_LINE_START)); + add( + calibration = new JLabel("0"), + c(1, row, 2, GridBagConstraints.FIRST_LINE_START) + ); add(new JLabel("Mag acc:"), c(2, row, 2, GridBagConstraints.FIRST_LINE_START)); - add(magAccuracy = new JLabel("0°"), c(3, row, 2, GridBagConstraints.FIRST_LINE_START)); + add( + magAccuracy = new JLabel("0°"), + c(3, row, 2, GridBagConstraints.FIRST_LINE_START) + ); row++; add(new JLabel("Correction:"), c(0, row, 2, GridBagConstraints.FIRST_LINE_START)); - add(correction = new JLabel("0 0 0"), s(c(1, row, 2, GridBagConstraints.FIRST_LINE_START), 3, 1)); + add( + correction = new JLabel("0 0 0"), + s(c(1, row, 2, GridBagConstraints.FIRST_LINE_START), 3, 1) + ); add(new JLabel("RotAdj:"), c(2, row, 2, GridBagConstraints.FIRST_LINE_START)); add(rotAdj = new JLabel("0"), c(3, row, 2, GridBagConstraints.FIRST_LINE_START)); row++; @@ -273,12 +321,21 @@ public class TrackersList extends EJBoxNoStretch { add(new JLabel("Att fix:"), c(0, row, 2, GridBagConstraints.FIRST_LINE_START)); add(adj = new JLabel("0 0 0 0"), c(1, row, 2, GridBagConstraints.FIRST_LINE_START)); add(new JLabel("Yaw Fix:"), c(2, row, 2, GridBagConstraints.FIRST_LINE_START)); - add(adjYaw = new JLabel("0 0 0 0"), c(3, row, 2, GridBagConstraints.FIRST_LINE_START)); + add( + adjYaw = new JLabel("0 0 0 0"), + c(3, row, 2, GridBagConstraints.FIRST_LINE_START) + ); row++; add(new JLabel("Gyro Fix:"), c(0, row, 2, GridBagConstraints.FIRST_LINE_START)); - add(adjGyro = new JLabel("0 0 0 0"), c(1, row, 2, GridBagConstraints.FIRST_LINE_START)); + add( + adjGyro = new JLabel("0 0 0 0"), + c(1, row, 2, GridBagConstraints.FIRST_LINE_START) + ); add(new JLabel("Temp:"), c(2, row, 2, GridBagConstraints.FIRST_LINE_START)); - add(temperature = new JLabel("?"), c(3, row, 2, GridBagConstraints.FIRST_LINE_START)); + add( + temperature = new JLabel("?"), + c(3, row, 2, GridBagConstraints.FIRST_LINE_START) + ); } setBorder(BorderFactory.createLineBorder(new Color(0x663399), 2, false)); @@ -299,13 +356,23 @@ public class TrackersList extends EJBoxNoStretch { q.toAngles(angles); if (position != null) - position.setText(StringUtils.prettyNumber(v.x, 1) - + " " + StringUtils.prettyNumber(v.y, 1) - + " " + StringUtils.prettyNumber(v.z, 1)); + position + .setText( + StringUtils.prettyNumber(v.x, 1) + + " " + + StringUtils.prettyNumber(v.y, 1) + + " " + + StringUtils.prettyNumber(v.z, 1) + ); if (rotation != null) - rotation.setText(StringUtils.prettyNumber(angles[0] * FastMath.RAD_TO_DEG, 0) - + " " + StringUtils.prettyNumber(angles[1] * FastMath.RAD_TO_DEG, 0) - + " " + StringUtils.prettyNumber(angles[2] * FastMath.RAD_TO_DEG, 0)); + rotation + .setText( + StringUtils.prettyNumber(angles[0] * FastMath.RAD_TO_DEG, 0) + + " " + + StringUtils.prettyNumber(angles[1] * FastMath.RAD_TO_DEG, 0) + + " " + + StringUtils.prettyNumber(angles[2] * FastMath.RAD_TO_DEG, 0) + ); status.setText(t.getStatus().toString().toLowerCase()); if (realTracker instanceof TrackerWithTPS) { @@ -320,28 +387,51 @@ public class TrackersList extends EJBoxNoStretch { } else if (voltage == 0.0f) { bat.setText(String.format("%d%%", Math.round(level))); } else { - bat.setText(String.format("%d%% (%sV)", Math.round(level), StringUtils.prettyNumber(voltage, 2))); + bat + .setText( + String + .format( + "%d%% (%sV)", + Math.round(level), + StringUtils.prettyNumber(voltage, 2) + ) + ); } } if (t instanceof ReferenceAdjustedTracker) { ReferenceAdjustedTracker rat = (ReferenceAdjustedTracker) t; if (adj != null) { rat.attachmentFix.toAngles(angles); - adj.setText(StringUtils.prettyNumber(angles[0] * FastMath.RAD_TO_DEG, 0) - + " " + StringUtils.prettyNumber(angles[1] * FastMath.RAD_TO_DEG, 0) - + " " + StringUtils.prettyNumber(angles[2] * FastMath.RAD_TO_DEG, 0)); + adj + .setText( + StringUtils.prettyNumber(angles[0] * FastMath.RAD_TO_DEG, 0) + + " " + + StringUtils.prettyNumber(angles[1] * FastMath.RAD_TO_DEG, 0) + + " " + + StringUtils.prettyNumber(angles[2] * FastMath.RAD_TO_DEG, 0) + ); } if (adjYaw != null) { rat.yawFix.toAngles(angles); - adjYaw.setText(StringUtils.prettyNumber(angles[0] * FastMath.RAD_TO_DEG, 0) - + " " + StringUtils.prettyNumber(angles[1] * FastMath.RAD_TO_DEG, 0) - + " " + StringUtils.prettyNumber(angles[2] * FastMath.RAD_TO_DEG, 0)); + adjYaw + .setText( + StringUtils.prettyNumber(angles[0] * FastMath.RAD_TO_DEG, 0) + + " " + + StringUtils.prettyNumber(angles[1] * FastMath.RAD_TO_DEG, 0) + + " " + + StringUtils.prettyNumber(angles[2] * FastMath.RAD_TO_DEG, 0) + ); } if (adjGyro != null) { rat.gyroFix.toAngles(angles); - adjGyro.setText(StringUtils.prettyNumber(angles[0] * FastMath.RAD_TO_DEG, 0) - + " " + StringUtils.prettyNumber(angles[1] * FastMath.RAD_TO_DEG, 0) - + " " + StringUtils.prettyNumber(angles[2] * FastMath.RAD_TO_DEG, 0)); + adjGyro + .setText( + StringUtils.prettyNumber(angles[0] * FastMath.RAD_TO_DEG, 0) + + " " + + StringUtils.prettyNumber(angles[1] * FastMath.RAD_TO_DEG, 0) + + " " + + StringUtils.prettyNumber(angles[2] * FastMath.RAD_TO_DEG, 0) + ); } } if (realTracker instanceof IMUTracker) { @@ -361,39 +451,69 @@ public class TrackersList extends EJBoxNoStretch { } realTracker.getRotation(q); q.toAngles(angles); - raw.setText(StringUtils.prettyNumber(angles[0] * FastMath.RAD_TO_DEG, 0) - + " " + StringUtils.prettyNumber(angles[1] * FastMath.RAD_TO_DEG, 0) - + " " + StringUtils.prettyNumber(angles[2] * FastMath.RAD_TO_DEG, 0)); + raw + .setText( + StringUtils.prettyNumber(angles[0] * FastMath.RAD_TO_DEG, 0) + + " " + + StringUtils.prettyNumber(angles[1] * FastMath.RAD_TO_DEG, 0) + + " " + + StringUtils.prettyNumber(angles[2] * FastMath.RAD_TO_DEG, 0) + ); if (realTracker instanceof IMUTracker) { IMUTracker imu = (IMUTracker) realTracker; if (rawMag != null) { imu.rotMagQuaternion.toAngles(angles); - rawMag.setText(StringUtils.prettyNumber(angles[0] * FastMath.RAD_TO_DEG, 0) - + " " + StringUtils.prettyNumber(angles[1] * FastMath.RAD_TO_DEG, 0) - + " " + StringUtils.prettyNumber(angles[2] * FastMath.RAD_TO_DEG, 0)); + rawMag + .setText( + StringUtils.prettyNumber(angles[0] * FastMath.RAD_TO_DEG, 0) + + " " + + StringUtils.prettyNumber(angles[1] * FastMath.RAD_TO_DEG, 0) + + " " + + StringUtils.prettyNumber(angles[2] * FastMath.RAD_TO_DEG, 0) + ); } if (calibration != null) calibration.setText(imu.calibrationStatus + " / " + imu.magCalibrationStatus); if (magAccuracy != null) - magAccuracy.setText(StringUtils.prettyNumber(imu.magnetometerAccuracy * FastMath.RAD_TO_DEG, 1) + "°"); + magAccuracy + .setText( + StringUtils + .prettyNumber(imu.magnetometerAccuracy * FastMath.RAD_TO_DEG, 1) + + "°" + ); if (correction != null) { imu.getCorrection(q); q.toAngles(angles); - correction.setText(StringUtils.prettyNumber(angles[0] * FastMath.RAD_TO_DEG, 0) - + " " + StringUtils.prettyNumber(angles[1] * FastMath.RAD_TO_DEG, 0) - + " " + StringUtils.prettyNumber(angles[2] * FastMath.RAD_TO_DEG, 0)); + correction + .setText( + StringUtils.prettyNumber(angles[0] * FastMath.RAD_TO_DEG, 0) + + " " + + StringUtils.prettyNumber(angles[1] * FastMath.RAD_TO_DEG, 0) + + " " + + StringUtils.prettyNumber(angles[2] * FastMath.RAD_TO_DEG, 0) + ); } if (rotQuat != null) { imu.rotQuaternion.toAngles(angles); - rotQuat.setText(StringUtils.prettyNumber(angles[0] * FastMath.RAD_TO_DEG, 0) - + " " + StringUtils.prettyNumber(angles[1] * FastMath.RAD_TO_DEG, 0) - + " " + StringUtils.prettyNumber(angles[2] * FastMath.RAD_TO_DEG, 0)); + rotQuat + .setText( + StringUtils.prettyNumber(angles[0] * FastMath.RAD_TO_DEG, 0) + + " " + + StringUtils.prettyNumber(angles[1] * FastMath.RAD_TO_DEG, 0) + + " " + + StringUtils.prettyNumber(angles[2] * FastMath.RAD_TO_DEG, 0) + ); } if (rotAdj != null) { imu.rotAdjust.toAngles(angles); - rotAdj.setText(StringUtils.prettyNumber(angles[0] * FastMath.RAD_TO_DEG, 0) - + " " + StringUtils.prettyNumber(angles[1] * FastMath.RAD_TO_DEG, 0) - + " " + StringUtils.prettyNumber(angles[2] * FastMath.RAD_TO_DEG, 0)); + rotAdj + .setText( + StringUtils.prettyNumber(angles[0] * FastMath.RAD_TO_DEG, 0) + + " " + + StringUtils.prettyNumber(angles[1] * FastMath.RAD_TO_DEG, 0) + + " " + + StringUtils.prettyNumber(angles[2] * FastMath.RAD_TO_DEG, 0) + ); } if (temperature != null) { if (imu.temperature == 0.0f) { diff --git a/src/main/java/dev/slimevr/gui/VRServerGUI.java b/src/main/java/dev/slimevr/gui/VRServerGUI.java index 2d686909a..627281eb9 100644 --- a/src/main/java/dev/slimevr/gui/VRServerGUI.java +++ b/src/main/java/dev/slimevr/gui/VRServerGUI.java @@ -30,6 +30,7 @@ import java.util.List; import static javax.swing.BoxLayout.LINE_AXIS; import static javax.swing.BoxLayout.PAGE_AXIS; + public class VRServerGUI extends JFrame { public static final String TITLE = "SlimeVR Server (" + Main.VERSION + ")"; @@ -74,7 +75,8 @@ public class VRServerGUI extends JFrame { this.zoom = server.config.getFloat("zoom", zoom); this.initZoom = zoom; setDefaultFontSize(zoom); - // All components should be constructed to the current zoom level by default + // All components should be constructed to the current zoom level by + // default setDefaultCloseOperation(EXIT_ON_CLOSE); getContentPane().setLayout(new BoxLayout(getContentPane(), PAGE_AXIS)); @@ -83,16 +85,31 @@ public class VRServerGUI extends JFrame { trackersFiltersGUI = new TrackersFiltersGUI(server, this); this.skeletonList = new SkeletonList(server, this); - JScrollPane scrollPane = (JScrollPane) add(new JScrollPane(pane = new EJBox(PAGE_AXIS), ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED)); + JScrollPane scrollPane = (JScrollPane) add( + new JScrollPane( + pane = new EJBox(PAGE_AXIS), + ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, + ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED + ) + ); scrollPane.getVerticalScrollBar().setUnitIncrement(16); GraphicsConfiguration gc = getGraphicsConfiguration(); Rectangle screenBounds = gc.getBounds(); setMinimumSize(new Dimension(100, 100)); - setSize(Math.min(server.config.getInt("window.width", 800), screenBounds.width), Math.min(server.config.getInt("window.height", 800), screenBounds.height)); - setLocation(server.config.getInt("window.posx", screenBounds.x + (screenBounds.width - getSize().width) / 2), screenBounds.y + server.config.getInt("window.posy", (screenBounds.height - getSize().height) / 2)); + setSize( + Math.min(server.config.getInt("window.width", 800), screenBounds.width), + Math.min(server.config.getInt("window.height", 800), screenBounds.height) + ); + setLocation( + server.config + .getInt("window.posx", screenBounds.x + (screenBounds.width - getSize().width) / 2), + screenBounds.y + + server.config.getInt("window.posy", (screenBounds.height - getSize().height) / 2) + ); - // Resize and close listeners to save position and size betwen launcher starts + // Resize and close listeners to save position and size betwen launcher + // starts addComponentListener(new AbstractComponentListener() { @Override public void componentResized(ComponentEvent e) { @@ -127,7 +144,9 @@ public class VRServerGUI extends JFrame { Object value = UIManager.get(key); if (value instanceof javax.swing.plaf.FontUIResource) { javax.swing.plaf.FontUIResource f = (javax.swing.plaf.FontUIResource) value; - javax.swing.plaf.FontUIResource f2 = new javax.swing.plaf.FontUIResource(f.deriveFont(f.getSize() * zoom)); + javax.swing.plaf.FontUIResource f2 = new javax.swing.plaf.FontUIResource( + f.deriveFont(f.getSize() * zoom) + ); UIManager.put(key, f2); } } @@ -148,7 +167,7 @@ public class VRServerGUI extends JFrame { public void refresh() { // Pack and display - //pack(); + // pack(); setVisible(true); java.awt.EventQueue.invokeLater(new Runnable() { @Override @@ -162,198 +181,275 @@ public class VRServerGUI extends JFrame { private void build() { pane.removeAll(); - pane.add(new EJBoxNoStretch(LINE_AXIS, false, true) {{ - setBorder(new EmptyBorder(i(5))); + pane.add(new EJBoxNoStretch(LINE_AXIS, false, true) { + { + setBorder(new EmptyBorder(i(5))); - add(Box.createHorizontalGlue()); - add(resetButton = new JButton("RESET") {{ - addMouseListener(new MouseInputAdapter() { - @Override - public void mouseClicked(MouseEvent e) { - reset(); + add(Box.createHorizontalGlue()); + add(resetButton = new JButton("RESET") { + { + addMouseListener(new MouseInputAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + reset(); + } + }); } }); - }}); - add(Box.createHorizontalStrut(10)); - add(new JButton("Fast Reset") {{ - addMouseListener(new MouseInputAdapter() { - @Override - public void mouseClicked(MouseEvent e) { - resetFast(); + add(Box.createHorizontalStrut(10)); + add(new JButton("Fast Reset") { + { + addMouseListener(new MouseInputAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + resetFast(); + } + }); } }); - }}); - add(Box.createHorizontalGlue()); - add(new JButton("Record BVH") {{ - addMouseListener(new MouseInputAdapter() { - @Override - public void mouseClicked(MouseEvent e) { - if (!server.getBvhRecorder().isRecording()) { - setText("Stop Recording BVH..."); - server.getBvhRecorder().startRecording(); - } else { - server.getBvhRecorder().endRecording(); - setText("Record BVH"); + add(Box.createHorizontalGlue()); + add(new JButton("Record BVH") { + { + addMouseListener(new MouseInputAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + if (!server.getBvhRecorder().isRecording()) { + setText("Stop Recording BVH..."); + server.getBvhRecorder().startRecording(); + } else { + server.getBvhRecorder().endRecording(); + setText("Record BVH"); + } + } + }); + } + }); + add(Box.createHorizontalGlue()); + add(new JButton("GUI Zoom (x" + StringUtils.prettyNumber(zoom, 2) + ")") { + { + addMouseListener(new MouseInputAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + guiZoom(); + setText("GUI Zoom (x" + StringUtils.prettyNumber(zoom, 2) + ")"); + } + }); + } + }); + add(Box.createHorizontalStrut(10)); + add(new JButton("WiFi") { + { + addMouseListener(new MouseInputAdapter() { + @SuppressWarnings("unused") + @Override + public void mouseClicked(MouseEvent e) { + new WiFiWindow(VRServerGUI.this); + } + }); + } + }); + add(Box.createHorizontalStrut(10)); + } + }); + + pane.add(new EJBox(LINE_AXIS) { + { + setBorder(new EmptyBorder(i(5))); + add(new EJBoxNoStretch(PAGE_AXIS, false, true) { + { + setAlignmentY(TOP_ALIGNMENT); + JLabel l; + add(l = new JLabel("Trackers list")); + l.setFont(l.getFont().deriveFont(Font.BOLD)); + l.setAlignmentX(0.5f); + add(trackersList); + add(Box.createVerticalGlue()); + } + }); + + add(new EJBoxNoStretch(PAGE_AXIS, false, true) { + { + setAlignmentY(TOP_ALIGNMENT); + + JCheckBox debugCb; + add(debugCb = new JCheckBox("Show debug information")); + debugCb.setSelected(false); + debugCb.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + trackersList.setDebug(debugCb.isSelected()); + } + }); + + JLabel l; + add(l = new JLabel("Body proportions")); + l.setFont(l.getFont().deriveFont(Font.BOLD)); + l.setAlignmentX(0.5f); + add(new SkeletonConfigGUI(server, VRServerGUI.this)); + add(Box.createVerticalStrut(10)); + if (server.hasBridge(WindowsNamedPipeBridge.class)) { + WindowsNamedPipeBridge br = server + .getVRBridge(WindowsNamedPipeBridge.class); + add(l = new JLabel("SteamVR Trackers")); + l.setFont(l.getFont().deriveFont(Font.BOLD)); + l.setAlignmentX(0.5f); + add(l = new JLabel("Changes may require restart of SteamVR")); + l.setFont(l.getFont().deriveFont(Font.ITALIC)); + l.setAlignmentX(0.5f); + + add(new EJBagNoStretch(false, true) { + { + JCheckBox waistCb; + add(waistCb = new JCheckBox("Waist"), c(1, 1)); + waistCb.setSelected(br.getShareSetting(TrackerRole.WAIST)); + waistCb.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + server.queueTask(() -> { + br + .changeShareSettings( + TrackerRole.WAIST, + waistCb.isSelected() + ); + }); + } + }); + + JCheckBox legsCb; + add(legsCb = new JCheckBox("Feet"), c(2, 1)); + legsCb + .setSelected( + br.getShareSetting(TrackerRole.LEFT_FOOT) + && br.getShareSetting(TrackerRole.RIGHT_FOOT) + ); + legsCb.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + server.queueTask(() -> { + br + .changeShareSettings( + TrackerRole.LEFT_FOOT, + legsCb.isSelected() + ); + br + .changeShareSettings( + TrackerRole.RIGHT_FOOT, + legsCb.isSelected() + ); + }); + } + }); + + JCheckBox chestCb; + add(chestCb = new JCheckBox("Chest"), c(1, 2)); + chestCb.setSelected(br.getShareSetting(TrackerRole.CHEST)); + chestCb.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + server.queueTask(() -> { + br + .changeShareSettings( + TrackerRole.CHEST, + chestCb.isSelected() + ); + }); + } + }); + + JCheckBox kneesCb; + add(kneesCb = new JCheckBox("Knees"), c(2, 2)); + kneesCb + .setSelected( + br.getShareSetting(TrackerRole.LEFT_KNEE) + && br.getShareSetting(TrackerRole.RIGHT_KNEE) + ); + kneesCb.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + server.queueTask(() -> { + br + .changeShareSettings( + TrackerRole.LEFT_KNEE, + kneesCb.isSelected() + ); + br + .changeShareSettings( + TrackerRole.RIGHT_KNEE, + kneesCb.isSelected() + ); + }); + } + }); + + JCheckBox elbowsCb; + add(elbowsCb = new JCheckBox("Elbows"), c(1, 3)); + elbowsCb + .setSelected( + br.getShareSetting(TrackerRole.LEFT_ELBOW) + && br.getShareSetting(TrackerRole.RIGHT_ELBOW) + ); + elbowsCb.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + server.queueTask(() -> { + br + .changeShareSettings( + TrackerRole.LEFT_ELBOW, + elbowsCb.isSelected() + ); + br + .changeShareSettings( + TrackerRole.RIGHT_ELBOW, + elbowsCb.isSelected() + ); + }); + } + }); + + JCheckBox handsCb; + add(handsCb = new JCheckBox("Hands"), c(2, 3)); + handsCb + .setSelected( + br.getShareSetting(TrackerRole.LEFT_HAND) + && br.getShareSetting(TrackerRole.RIGHT_HAND) + ); + handsCb.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + server.queueTask(() -> { + br + .changeShareSettings( + TrackerRole.LEFT_HAND, + handsCb.isSelected() + ); + br + .changeShareSettings( + TrackerRole.RIGHT_HAND, + handsCb.isSelected() + ); + }); + } + }); + } + }); + + add(Box.createVerticalStrut(10)); } + + add(l = new JLabel("Trackers filtering")); + l.setFont(l.getFont().deriveFont(Font.BOLD)); + l.setAlignmentX(0.5f); + add(trackersFiltersGUI); + + add(Box.createVerticalStrut(10)); + + add(new JLabel("Skeleton data")); + add(skeletonList); + add(Box.createVerticalGlue()); } }); - }}); - add(Box.createHorizontalGlue()); - add(new JButton("GUI Zoom (x" + StringUtils.prettyNumber(zoom, 2) + ")") {{ - addMouseListener(new MouseInputAdapter() { - @Override - public void mouseClicked(MouseEvent e) { - guiZoom(); - setText("GUI Zoom (x" + StringUtils.prettyNumber(zoom, 2) + ")"); - } - }); - }}); - add(Box.createHorizontalStrut(10)); - add(new JButton("WiFi") {{ - addMouseListener(new MouseInputAdapter() { - @SuppressWarnings("unused") - @Override - public void mouseClicked(MouseEvent e) { - new WiFiWindow(VRServerGUI.this); - } - }); - }}); - add(Box.createHorizontalStrut(10)); - }}); - - pane.add(new EJBox(LINE_AXIS) {{ - setBorder(new EmptyBorder(i(5))); - add(new EJBoxNoStretch(PAGE_AXIS, false, true) {{ - setAlignmentY(TOP_ALIGNMENT); - JLabel l; - add(l = new JLabel("Trackers list")); - l.setFont(l.getFont().deriveFont(Font.BOLD)); - l.setAlignmentX(0.5f); - add(trackersList); - add(Box.createVerticalGlue()); - }}); - - add(new EJBoxNoStretch(PAGE_AXIS, false, true) {{ - setAlignmentY(TOP_ALIGNMENT); - - JCheckBox debugCb; - add(debugCb = new JCheckBox("Show debug information")); - debugCb.setSelected(false); - debugCb.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - trackersList.setDebug(debugCb.isSelected()); - } - }); - - JLabel l; - add(l = new JLabel("Body proportions")); - l.setFont(l.getFont().deriveFont(Font.BOLD)); - l.setAlignmentX(0.5f); - add(new SkeletonConfigGUI(server, VRServerGUI.this)); - add(Box.createVerticalStrut(10)); - if (server.hasBridge(WindowsNamedPipeBridge.class)) { - WindowsNamedPipeBridge br = server.getVRBridge(WindowsNamedPipeBridge.class); - add(l = new JLabel("SteamVR Trackers")); - l.setFont(l.getFont().deriveFont(Font.BOLD)); - l.setAlignmentX(0.5f); - add(l = new JLabel("Changes may require restart of SteamVR")); - l.setFont(l.getFont().deriveFont(Font.ITALIC)); - l.setAlignmentX(0.5f); - - add(new EJBagNoStretch(false, true) {{ - JCheckBox waistCb; - add(waistCb = new JCheckBox("Waist"), c(1, 1)); - waistCb.setSelected(br.getShareSetting(TrackerRole.WAIST)); - waistCb.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - server.queueTask(() -> { - br.changeShareSettings(TrackerRole.WAIST, waistCb.isSelected()); - }); - } - }); - - JCheckBox legsCb; - add(legsCb = new JCheckBox("Feet"), c(2, 1)); - legsCb.setSelected(br.getShareSetting(TrackerRole.LEFT_FOOT) && br.getShareSetting(TrackerRole.RIGHT_FOOT)); - legsCb.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - server.queueTask(() -> { - br.changeShareSettings(TrackerRole.LEFT_FOOT, legsCb.isSelected()); - br.changeShareSettings(TrackerRole.RIGHT_FOOT, legsCb.isSelected()); - }); - } - }); - - JCheckBox chestCb; - add(chestCb = new JCheckBox("Chest"), c(1, 2)); - chestCb.setSelected(br.getShareSetting(TrackerRole.CHEST)); - chestCb.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - server.queueTask(() -> { - br.changeShareSettings(TrackerRole.CHEST, chestCb.isSelected()); - }); - } - }); - - JCheckBox kneesCb; - add(kneesCb = new JCheckBox("Knees"), c(2, 2)); - kneesCb.setSelected(br.getShareSetting(TrackerRole.LEFT_KNEE) && br.getShareSetting(TrackerRole.RIGHT_KNEE)); - kneesCb.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - server.queueTask(() -> { - br.changeShareSettings(TrackerRole.LEFT_KNEE, kneesCb.isSelected()); - br.changeShareSettings(TrackerRole.RIGHT_KNEE, kneesCb.isSelected()); - }); - } - }); - - JCheckBox elbowsCb; - add(elbowsCb = new JCheckBox("Elbows"), c(1, 3)); - elbowsCb.setSelected(br.getShareSetting(TrackerRole.LEFT_ELBOW) && br.getShareSetting(TrackerRole.RIGHT_ELBOW)); - elbowsCb.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - server.queueTask(() -> { - br.changeShareSettings(TrackerRole.LEFT_ELBOW, elbowsCb.isSelected()); - br.changeShareSettings(TrackerRole.RIGHT_ELBOW, elbowsCb.isSelected()); - }); - } - }); - - JCheckBox handsCb; - add(handsCb = new JCheckBox("Hands"), c(2, 3)); - handsCb.setSelected(br.getShareSetting(TrackerRole.LEFT_HAND) && br.getShareSetting(TrackerRole.RIGHT_HAND)); - handsCb.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - server.queueTask(() -> { - br.changeShareSettings(TrackerRole.LEFT_HAND, handsCb.isSelected()); - br.changeShareSettings(TrackerRole.RIGHT_HAND, handsCb.isSelected()); - }); - } - }); - }}); - - add(Box.createVerticalStrut(10)); - } - - add(l = new JLabel("Trackers filtering")); - l.setFont(l.getFont().deriveFont(Font.BOLD)); - l.setAlignmentX(0.5f); - add(trackersFiltersGUI); - - add(Box.createVerticalStrut(10)); - - add(new JLabel("Skeleton data")); - add(skeletonList); - add(Box.createVerticalGlue()); - }}); - }}); + } + }); pane.add(Box.createVerticalGlue()); refresh(); @@ -362,7 +458,9 @@ public class VRServerGUI extends JFrame { server.addOnTick(skeletonList::updateBones); } - // For now only changes font size, but should change fixed components size in the future too + // For now only changes font size, but should change fixed components size + // in + // the future too private void guiZoom() { if (zoom <= 1.0f) { zoom = 1.5f; diff --git a/src/main/java/dev/slimevr/gui/WiFiWindow.java b/src/main/java/dev/slimevr/gui/WiFiWindow.java index 96843c2e0..aba977123 100644 --- a/src/main/java/dev/slimevr/gui/WiFiWindow.java +++ b/src/main/java/dev/slimevr/gui/WiFiWindow.java @@ -12,6 +12,7 @@ import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; + public class WiFiWindow extends JFrame implements SerialListener { private static String savedSSID = ""; @@ -35,7 +36,13 @@ public class WiFiWindow extends JFrame implements SerialListener { @AWTThread private void build() { if (!this.gui.server.getSerialHandler().openSerial()) { - JOptionPane.showMessageDialog(null, "Unable to open a serial connection. Check that your drivers are installed and nothing is using the serial port already (like Cura or VScode or another slimeVR server)", "SlimeVR: Serial connection error", JOptionPane.ERROR_MESSAGE); + JOptionPane + .showMessageDialog( + null, + "Unable to open a serial connection. Check that your drivers are installed and nothing is using the serial port already (like Cura or VScode or another slimeVR server)", + "SlimeVR: Serial connection error", + JOptionPane.ERROR_MESSAGE + ); } } @@ -43,45 +50,69 @@ public class WiFiWindow extends JFrame implements SerialListener { @AWTThread public void onSerialConnected(SerialPort port) { Container pane = getContentPane(); - pane.add(new EJBox(BoxLayout.PAGE_AXIS) {{ - add(new JLabel("Tracker connected to " + port.getSystemPortName() + " (" + port.getDescriptivePortName() + ")")); - JScrollPane scroll; - add(scroll = new JScrollPane(log = new JTextArea(10, 20), ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER)); - log.setLineWrap(true); - scroll.setAutoscrolls(true); - add(new JLabel("Enter WiFi credentials:")); - add(new EJBox(BoxLayout.LINE_AXIS) {{ - add(new JLabel("Network name:")); - add(ssidField = new JTextField(savedSSID)); - }}); - add(new EJBox(BoxLayout.LINE_AXIS) {{ - add(new JLabel("Network password:")); - passwdField = new JPasswordField(savedPassword); - passwdField.setEchoChar('\u25cf'); - add(passwdField); - add(new JCheckBox("Show Password") {{ - addMouseListener(new MouseInputAdapter() { - @Override - public void mouseClicked(MouseEvent e) { - if (isSelected()) - passwdField.setEchoChar((char) 0); - else - passwdField.setEchoChar('\u25cf'); - } - }); - }}); - }}); - add(new JButton("Send") {{ - addMouseListener(new MouseInputAdapter() { - @Override - public void mouseClicked(MouseEvent e) { - savedSSID = ssidField.getText(); - savedPassword = new String(passwdField.getPassword()); - gui.server.getSerialHandler().setWifi(savedSSID, savedPassword); + pane.add(new EJBox(BoxLayout.PAGE_AXIS) { + { + add( + new JLabel( + "Tracker connected to " + + port.getSystemPortName() + + " (" + + port.getDescriptivePortName() + + ")" + ) + ); + JScrollPane scroll; + add( + scroll = new JScrollPane( + log = new JTextArea(10, 20), + ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS, + ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER + ) + ); + log.setLineWrap(true); + scroll.setAutoscrolls(true); + add(new JLabel("Enter WiFi credentials:")); + add(new EJBox(BoxLayout.LINE_AXIS) { + { + add(new JLabel("Network name:")); + add(ssidField = new JTextField(savedSSID)); } }); - }}); - }}); + add(new EJBox(BoxLayout.LINE_AXIS) { + { + add(new JLabel("Network password:")); + passwdField = new JPasswordField(savedPassword); + passwdField.setEchoChar('\u25cf'); + add(passwdField); + add(new JCheckBox("Show Password") { + { + addMouseListener(new MouseInputAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + if (isSelected()) + passwdField.setEchoChar((char) 0); + else + passwdField.setEchoChar('\u25cf'); + } + }); + } + }); + } + }); + add(new JButton("Send") { + { + addMouseListener(new MouseInputAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + savedSSID = ssidField.getText(); + savedPassword = new String(passwdField.getPassword()); + gui.server.getSerialHandler().setWifi(savedSSID, savedPassword); + } + }); + } + }); + } + }); pack(); setLocationRelativeTo(null); diff --git a/src/main/java/dev/slimevr/gui/swing/ButtonTimer.java b/src/main/java/dev/slimevr/gui/swing/ButtonTimer.java index efb2563cf..79da63a18 100644 --- a/src/main/java/dev/slimevr/gui/swing/ButtonTimer.java +++ b/src/main/java/dev/slimevr/gui/swing/ButtonTimer.java @@ -4,11 +4,17 @@ import javax.swing.*; import java.util.Timer; import java.util.TimerTask; + public class ButtonTimer { private static final Timer timer = new Timer(); - public static void runTimer(AbstractButton button, int seconds, String defaultText, Runnable runnable) { + public static void runTimer( + AbstractButton button, + int seconds, + String defaultText, + Runnable runnable + ) { if (seconds <= 0) { button.setText(defaultText); runnable.run(); @@ -25,7 +31,12 @@ public class ButtonTimer { private final String defaultText; private final Runnable runnable; - private ButtonTimerTask(AbstractButton button, int seconds, String defaultText, Runnable runnable) { + private ButtonTimerTask( + AbstractButton button, + int seconds, + String defaultText, + Runnable runnable + ) { this.button = button; this.seconds = seconds; this.defaultText = defaultText; diff --git a/src/main/java/dev/slimevr/gui/swing/EJBag.java b/src/main/java/dev/slimevr/gui/swing/EJBag.java index c5da5ea6d..38697e58c 100644 --- a/src/main/java/dev/slimevr/gui/swing/EJBag.java +++ b/src/main/java/dev/slimevr/gui/swing/EJBag.java @@ -2,6 +2,7 @@ package dev.slimevr.gui.swing; import java.awt.*; + public class EJBag extends EJPanel { public EJBag() { diff --git a/src/main/java/dev/slimevr/gui/swing/EJBagNoStretch.java b/src/main/java/dev/slimevr/gui/swing/EJBagNoStretch.java index 49da9a432..f5db19e06 100644 --- a/src/main/java/dev/slimevr/gui/swing/EJBagNoStretch.java +++ b/src/main/java/dev/slimevr/gui/swing/EJBagNoStretch.java @@ -2,6 +2,7 @@ package dev.slimevr.gui.swing; import java.awt.*; + public class EJBagNoStretch extends EJPanel { public EJBagNoStretch(boolean stretchVertical, boolean stretchHorizontal) { diff --git a/src/main/java/dev/slimevr/gui/swing/EJBox.java b/src/main/java/dev/slimevr/gui/swing/EJBox.java index cb3a274ef..a2788ee8f 100644 --- a/src/main/java/dev/slimevr/gui/swing/EJBox.java +++ b/src/main/java/dev/slimevr/gui/swing/EJBox.java @@ -2,6 +2,7 @@ package dev.slimevr.gui.swing; import javax.swing.*; + public class EJBox extends EJPanel { public EJBox(int layout) { diff --git a/src/main/java/dev/slimevr/gui/swing/EJBoxNoStretch.java b/src/main/java/dev/slimevr/gui/swing/EJBoxNoStretch.java index f0e6c2cb9..b5cab4c1e 100644 --- a/src/main/java/dev/slimevr/gui/swing/EJBoxNoStretch.java +++ b/src/main/java/dev/slimevr/gui/swing/EJBoxNoStretch.java @@ -3,6 +3,7 @@ package dev.slimevr.gui.swing; import javax.swing.*; import java.awt.*; + public class EJBoxNoStretch extends EJPanel { public EJBoxNoStretch(int layout, boolean stretchVertical, boolean stretchHorizontal) { @@ -15,7 +16,12 @@ public class EJBoxNoStretch extends EJPanel { private final boolean stretchVertical; private final boolean stretchHorizontal; - public BoxLayoutNoStretch(Container target, int axis, boolean stretchVertical, boolean stretchHorizontal) { + public BoxLayoutNoStretch( + Container target, + int axis, + boolean stretchVertical, + boolean stretchHorizontal + ) { super(target, axis); this.stretchVertical = stretchVertical; this.stretchHorizontal = stretchHorizontal; diff --git a/src/main/java/dev/slimevr/gui/swing/EJPanel.java b/src/main/java/dev/slimevr/gui/swing/EJPanel.java index a3c2ade3e..d10484f03 100644 --- a/src/main/java/dev/slimevr/gui/swing/EJPanel.java +++ b/src/main/java/dev/slimevr/gui/swing/EJPanel.java @@ -3,6 +3,7 @@ package dev.slimevr.gui.swing; import javax.swing.*; import java.awt.*; + public abstract class EJPanel extends JPanel { public static boolean NEEDS_DOWNSCALE = false; diff --git a/src/main/java/dev/slimevr/gui/swing/EJlabel.java b/src/main/java/dev/slimevr/gui/swing/EJlabel.java index 97b820360..a219d2c4d 100644 --- a/src/main/java/dev/slimevr/gui/swing/EJlabel.java +++ b/src/main/java/dev/slimevr/gui/swing/EJlabel.java @@ -2,6 +2,7 @@ package dev.slimevr.gui.swing; import javax.swing.*; + public class EJlabel extends JLabel { } diff --git a/src/main/java/dev/slimevr/hardware/magentometer/Magneto.java b/src/main/java/dev/slimevr/hardware/magentometer/Magneto.java index b9ca90477..0bb551b66 100644 --- a/src/main/java/dev/slimevr/hardware/magentometer/Magneto.java +++ b/src/main/java/dev/slimevr/hardware/magentometer/Magneto.java @@ -3,6 +3,7 @@ package dev.slimevr.hardware.magentometer; import com.sun.jna.Library; import com.sun.jna.Native; + public interface Magneto extends Library { Magneto INSTANCE = Native.load("MagnetoLib", Magneto.class); diff --git a/src/main/java/dev/slimevr/platform/windows/WindowsNamedPipeBridge.java b/src/main/java/dev/slimevr/platform/windows/WindowsNamedPipeBridge.java index ee161e71f..c1aa6263a 100644 --- a/src/main/java/dev/slimevr/platform/windows/WindowsNamedPipeBridge.java +++ b/src/main/java/dev/slimevr/platform/windows/WindowsNamedPipeBridge.java @@ -18,17 +18,25 @@ import io.eiren.util.logging.LogManager; import java.io.IOException; import java.util.List; + public class WindowsNamedPipeBridge extends ProtobufBridge implements Runnable { protected final String pipeName; protected final String bridgeSettingsKey; protected final Thread runnerThread; - private final TrackerRole[] defaultRoles = new TrackerRole[]{TrackerRole.WAIST, TrackerRole.LEFT_FOOT, TrackerRole.RIGHT_FOOT}; + private final TrackerRole[] defaultRoles = new TrackerRole[] { TrackerRole.WAIST, + TrackerRole.LEFT_FOOT, TrackerRole.RIGHT_FOOT }; private final byte[] buffArray = new byte[2048]; private final List shareableTrackers; protected WindowsPipe pipe; - public WindowsNamedPipeBridge(HMDTracker hmd, String bridgeSettingsKey, String bridgeName, String pipeName, List shareableTrackers) { + public WindowsNamedPipeBridge( + HMDTracker hmd, + String bridgeSettingsKey, + String bridgeName, + String pipeName, + List shareableTrackers + ) { super(bridgeName, hmd); this.pipeName = pipeName; this.bridgeSettingsKey = bridgeSettingsKey; @@ -40,11 +48,25 @@ public class WindowsNamedPipeBridge extends ProtobufBridge implements @VRServerThread public void startBridge() { for (TrackerRole role : defaultRoles) { - changeShareSettings(role, Main.vrServer.config.getBoolean("bridge." + bridgeSettingsKey + ".trackers." + role.name().toLowerCase(), true)); + changeShareSettings( + role, + Main.vrServer.config + .getBoolean( + "bridge." + bridgeSettingsKey + ".trackers." + role.name().toLowerCase(), + true + ) + ); } for (ShareableTracker tr : shareableTrackers) { TrackerRole role = tr.getTrackerRole(); - changeShareSettings(role, Main.vrServer.config.getBoolean("bridge." + bridgeSettingsKey + ".trackers." + role.name().toLowerCase(), false)); + changeShareSettings( + role, + Main.vrServer.config + .getBoolean( + "bridge." + bridgeSettingsKey + ".trackers." + role.name().toLowerCase(), + false + ) + ); } runnerThread.start(); } @@ -70,7 +92,11 @@ public class WindowsNamedPipeBridge extends ProtobufBridge implements } else { removeSharedTracker(tr); } - Main.vrServer.config.setProperty("bridge." + bridgeSettingsKey + ".trackers." + role.name().toLowerCase(), share); + Main.vrServer.config + .setProperty( + "bridge." + bridgeSettingsKey + ".trackers." + role.name().toLowerCase(), + share + ); Main.vrServer.saveConfig(); } } @@ -79,7 +105,13 @@ public class WindowsNamedPipeBridge extends ProtobufBridge implements @Override @VRServerThread protected VRTracker createNewTracker(TrackerAdded trackerAdded) { - VRTracker tracker = new VRTracker(trackerAdded.getTrackerId(), trackerAdded.getTrackerSerial(), trackerAdded.getTrackerName(), true, true); + VRTracker tracker = new VRTracker( + trackerAdded.getTrackerId(), + trackerAdded.getTrackerSerial(), + trackerAdded.getTrackerName(), + true, + true + ); TrackerRole role = TrackerRole.getById(trackerAdded.getTrackerRole()); if (role != null) { tracker.setBodyPosition(TrackerPosition.getByRole(role)); @@ -135,7 +167,8 @@ public class WindowsNamedPipeBridge extends ProtobufBridge implements return true; } pipe.state = PipeState.ERROR; - LogManager.log.severe("[" + bridgeName + "] Pipe error: " + Kernel32.INSTANCE.GetLastError()); + LogManager + .severe("[" + bridgeName + "] Pipe error: " + Kernel32.INSTANCE.GetLastError()); } catch (IOException e) { e.printStackTrace(); } @@ -147,22 +180,51 @@ public class WindowsNamedPipeBridge extends ProtobufBridge implements if (pipe.state == PipeState.OPEN) { boolean readAnything = false; IntByReference bytesAvailable = new IntByReference(0); - while (Kernel32.INSTANCE.PeekNamedPipe(pipe.pipeHandle, buffArray, 4, null, bytesAvailable, null)) { + while ( + Kernel32.INSTANCE + .PeekNamedPipe(pipe.pipeHandle, buffArray, 4, null, bytesAvailable, null) + ) { if (bytesAvailable.getValue() >= 4) { // Got size - int messageLength = (buffArray[3] << 24) | (buffArray[2] << 16) | (buffArray[1] << 8) | buffArray[0]; + int messageLength = (buffArray[3] << 24) + | (buffArray[2] << 16) + | (buffArray[1] << 8) + | buffArray[0]; if (messageLength > 1024) { // Overflow - LogManager.log.severe("[" + bridgeName + "] Pipe overflow. Message length: " + messageLength); + LogManager + .severe( + "[" + + bridgeName + + "] Pipe overflow. Message length: " + + messageLength + ); pipe.state = PipeState.ERROR; return readAnything; } if (bytesAvailable.getValue() >= messageLength) { - if (Kernel32.INSTANCE.ReadFile(pipe.pipeHandle, buffArray, messageLength, bytesAvailable, null)) { - ProtobufMessage message = ProtobufMessage.parser().parseFrom(buffArray, 4, messageLength - 4); + if ( + Kernel32.INSTANCE + .ReadFile( + pipe.pipeHandle, + buffArray, + messageLength, + bytesAvailable, + null + ) + ) { + ProtobufMessage message = ProtobufMessage + .parser() + .parseFrom(buffArray, 4, messageLength - 4); messageReceived(message); readAnything = true; } else { pipe.state = PipeState.ERROR; - LogManager.log.severe("[" + bridgeName + "] Pipe error: " + Kernel32.INSTANCE.GetLastError()); + LogManager + .severe( + "[" + + bridgeName + + "] Pipe error: " + + Kernel32.INSTANCE.GetLastError() + ); return readAnything; } } else { @@ -173,7 +235,8 @@ public class WindowsNamedPipeBridge extends ProtobufBridge implements } } pipe.state = PipeState.ERROR; - LogManager.log.severe("[" + bridgeName + "] Pipe error: " + Kernel32.INSTANCE.GetLastError()); + LogManager + .severe("[" + bridgeName + "] Pipe error: " + Kernel32.INSTANCE.GetLastError()); } return false; } @@ -186,17 +249,26 @@ public class WindowsNamedPipeBridge extends ProtobufBridge implements private void createPipe() throws IOException { try { - pipe = new WindowsPipe(Kernel32.INSTANCE.CreateNamedPipe(pipeName, WinBase.PIPE_ACCESS_DUPLEX, // dwOpenMode - WinBase.PIPE_TYPE_BYTE | WinBase.PIPE_READMODE_BYTE | WinBase.PIPE_WAIT, // dwPipeMode - 1, // nMaxInstances, - 1024 * 16, // nOutBufferSize, - 1024 * 16, // nInBufferSize, - 0, // nDefaultTimeOut, - null), pipeName); // lpSecurityAttributes - LogManager.log.info("[" + bridgeName + "] Pipe " + pipe.name + " created"); + pipe = new WindowsPipe( + Kernel32.INSTANCE + .CreateNamedPipe( + pipeName, + WinBase.PIPE_ACCESS_DUPLEX, // dwOpenMode + WinBase.PIPE_TYPE_BYTE | WinBase.PIPE_READMODE_BYTE | WinBase.PIPE_WAIT, // dwPipeMode + 1, // nMaxInstances, + 1024 * 16, // nOutBufferSize, + 1024 * 16, // nInBufferSize, + 0, // nDefaultTimeOut, + null + ), + pipeName + ); // lpSecurityAttributes + LogManager.info("[" + bridgeName + "] Pipe " + pipe.name + " created"); if (WinBase.INVALID_HANDLE_VALUE.equals(pipe.pipeHandle)) - throw new IOException("Can't open " + pipeName + " pipe: " + Kernel32.INSTANCE.GetLastError()); - LogManager.log.info("[" + bridgeName + "] Pipes are created"); + throw new IOException( + "Can't open " + pipeName + " pipe: " + Kernel32.INSTANCE.GetLastError() + ); + LogManager.info("[" + bridgeName + "] Pipes are created"); } catch (IOException e) { WindowsPipe.safeDisconnect(pipe); throw e; @@ -204,13 +276,24 @@ public class WindowsNamedPipeBridge extends ProtobufBridge implements } private boolean tryOpeningPipe(WindowsPipe pipe) { - if (Kernel32.INSTANCE.ConnectNamedPipe(pipe.pipeHandle, null) || Kernel32.INSTANCE.GetLastError() == WinError.ERROR_PIPE_CONNECTED) { + if ( + Kernel32.INSTANCE.ConnectNamedPipe(pipe.pipeHandle, null) + || Kernel32.INSTANCE.GetLastError() == WinError.ERROR_PIPE_CONNECTED + ) { pipe.state = PipeState.OPEN; - LogManager.log.info("[" + bridgeName + "] Pipe " + pipe.name + " is open"); + LogManager.info("[" + bridgeName + "] Pipe " + pipe.name + " is open"); Main.vrServer.queueTask(this::reconnected); return true; } - LogManager.log.info("[" + bridgeName + "] Error connecting to pipe " + pipe.name + ": " + Kernel32.INSTANCE.GetLastError()); + LogManager + .info( + "[" + + bridgeName + + "] Error connecting to pipe " + + pipe.name + + ": " + + Kernel32.INSTANCE.GetLastError() + ); return false; } } diff --git a/src/main/java/dev/slimevr/platform/windows/WindowsNamedPipeVRBridge.java b/src/main/java/dev/slimevr/platform/windows/WindowsNamedPipeVRBridge.java index 61fbf46eb..6f7ea12d0 100644 --- a/src/main/java/dev/slimevr/platform/windows/WindowsNamedPipeVRBridge.java +++ b/src/main/java/dev/slimevr/platform/windows/WindowsNamedPipeVRBridge.java @@ -19,6 +19,7 @@ import java.nio.charset.StandardCharsets; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; + public class WindowsNamedPipeVRBridge extends Thread implements Bridge { public static final String HMDPipeName = "\\\\.\\pipe\\HMDPipe"; @@ -40,14 +41,23 @@ public class WindowsNamedPipeVRBridge extends Thread implements Bridge { private final AtomicBoolean newHMDData = new AtomicBoolean(false); private WindowsPipe hmdPipe; - public WindowsNamedPipeVRBridge(HMDTracker hmd, List shareTrackers, VRServer server) { + public WindowsNamedPipeVRBridge( + HMDTracker hmd, + List shareTrackers, + VRServer server + ) { super("Named Pipe VR Bridge"); this.hmd = hmd; this.shareTrackers = new FastList<>(shareTrackers); this.trackerPipes = new FastList<>(shareTrackers.size()); this.internalTrackers = new FastList<>(shareTrackers.size()); for (Tracker t : shareTrackers) { - ComputedTracker ct = new ComputedTracker(t.getTrackerId(), "internal://" + t.getName(), true, true); + ComputedTracker ct = new ComputedTracker( + t.getTrackerId(), + "internal://" + t.getName(), + true, + true + ); ct.setStatus(TrackerStatus.OK); this.internalTrackers.add(ct); } @@ -57,8 +67,7 @@ public class WindowsNamedPipeVRBridge extends Thread implements Bridge { try { if (pipe != null && pipe.pipeHandle != null) Kernel32.INSTANCE.DisconnectNamedPipe(pipe.pipeHandle); - } catch (Exception e) { - } + } catch (Exception e) {} } @Override @@ -68,7 +77,8 @@ public class WindowsNamedPipeVRBridge extends Thread implements Bridge { while (true) { waitForPipesToOpen(); if (areAllPipesOpen()) { - boolean hmdUpdated = updateHMD(); // Update at HMDs frequency + boolean hmdUpdated = updateHMD(); // Update at HMDs + // frequency for (int i = 0; i < trackerPipes.size(); ++i) { updateTracker(i, hmdUpdated); } @@ -120,9 +130,21 @@ public class WindowsNamedPipeVRBridge extends Thread implements Bridge { public boolean updateHMD() throws IOException { if (hmdPipe.state == PipeState.OPEN) { IntByReference bytesAvailable = new IntByReference(0); - if (Kernel32.INSTANCE.PeekNamedPipe(hmdPipe.pipeHandle, null, 0, null, bytesAvailable, null)) { + if ( + Kernel32.INSTANCE + .PeekNamedPipe(hmdPipe.pipeHandle, null, 0, null, bytesAvailable, null) + ) { if (bytesAvailable.getValue() > 0) { - while (Kernel32.INSTANCE.ReadFile(hmdPipe.pipeHandle, buffArray, buffArray.length, bytesAvailable, null)) { + while ( + Kernel32.INSTANCE + .ReadFile( + hmdPipe.pipeHandle, + buffArray, + buffArray.length, + bytesAvailable, + null + ) + ) { int bytesRead = bytesAvailable.getValue(); for (int i = 0; i < bytesRead; ++i) { char c = (char) buffArray[i]; @@ -132,7 +154,10 @@ public class WindowsNamedPipeVRBridge extends Thread implements Bridge { } else { commandBuilder.append(c); if (commandBuilder.length() >= MAX_COMMAND_LENGTH) { - LogManager.log.severe("[VRBridge] Command from the pipe is too long, flushing buffer"); + LogManager + .severe( + "[VRBridge] Command from the pipe is too long, flushing buffer" + ); commandBuilder.setLength(0); } } @@ -150,7 +175,7 @@ public class WindowsNamedPipeVRBridge extends Thread implements Bridge { private void executeHMDInput() throws IOException { String[] split = commandBuilder.toString().split(" "); if (split.length < 7) { - LogManager.log.severe("[VRBridge] Short HMD data received: " + commandBuilder); + LogManager.severe("[VRBridge] Short HMD data received: " + commandBuilder); return; } try { @@ -179,13 +204,34 @@ public class WindowsNamedPipeVRBridge extends Thread implements Bridge { sbBuffer.setLength(0); sensor.getPosition(vBuffer); sensor.getRotation(qBuffer); - sbBuffer.append(vBuffer.x).append(' ').append(vBuffer.y).append(' ').append(vBuffer.z).append(' '); - sbBuffer.append(qBuffer.getW()).append(' ').append(qBuffer.getX()).append(' ').append(qBuffer.getY()).append(' ').append(qBuffer.getZ()).append('\n'); + sbBuffer + .append(vBuffer.x) + .append(' ') + .append(vBuffer.y) + .append(' ') + .append(vBuffer.z) + .append(' '); + sbBuffer + .append(qBuffer.getW()) + .append(' ') + .append(qBuffer.getX()) + .append(' ') + .append(qBuffer.getY()) + .append(' ') + .append(qBuffer.getZ()) + .append('\n'); String str = sbBuffer.toString(); System.arraycopy(str.getBytes(ASCII), 0, buffArray, 0, str.length()); buffArray[str.length()] = '\0'; IntByReference lpNumberOfBytesWritten = new IntByReference(0); - Kernel32.INSTANCE.WriteFile(trackerPipe.pipeHandle, buffArray, str.length() + 1, lpNumberOfBytesWritten, null); + Kernel32.INSTANCE + .WriteFile( + trackerPipe.pipeHandle, + buffArray, + str.length() + 1, + lpNumberOfBytesWritten, + null + ); } } } @@ -199,21 +245,30 @@ public class WindowsNamedPipeVRBridge extends Thread implements Bridge { System.arraycopy(trackerHello.getBytes(ASCII), 0, buffArray, 0, trackerHello.length()); buffArray[trackerHello.length()] = '\0'; IntByReference lpNumberOfBytesWritten = new IntByReference(0); - Kernel32.INSTANCE.WriteFile(pipe.pipeHandle, + Kernel32.INSTANCE + .WriteFile( + pipe.pipeHandle, buffArray, trackerHello.length() + 1, lpNumberOfBytesWritten, - null); + null + ); } private boolean tryOpeningPipe(WindowsPipe pipe) { if (Kernel32.INSTANCE.ConnectNamedPipe(pipe.pipeHandle, null)) { pipe.state = PipeState.OPEN; - LogManager.log.info("[VRBridge] Pipe " + pipe.name + " is open"); + LogManager.info("[VRBridge] Pipe " + pipe.name + " is open"); return true; } - LogManager.log.info("[VRBridge] Error connecting to pipe " + pipe.name + ": " + Kernel32.INSTANCE.GetLastError()); + LogManager + .info( + "[VRBridge] Error connecting to pipe " + + pipe.name + + ": " + + Kernel32.INSTANCE.GetLastError() + ); return false; } @@ -231,31 +286,46 @@ public class WindowsNamedPipeVRBridge extends Thread implements Bridge { private void createPipes() throws IOException { try { - hmdPipe = new WindowsPipe(Kernel32.INSTANCE.CreateNamedPipe(HMDPipeName, WinBase.PIPE_ACCESS_DUPLEX, // dwOpenMode - WinBase.PIPE_TYPE_BYTE | WinBase.PIPE_READMODE_BYTE | WinBase.PIPE_WAIT, // dwPipeMode - 1, // nMaxInstances, - 1024 * 16, // nOutBufferSize, - 1024 * 16, // nInBufferSize, - 0, // nDefaultTimeOut, - null), HMDPipeName); // lpSecurityAttributes - LogManager.log.info("[VRBridge] Pipe " + hmdPipe.name + " created"); - if (WinBase.INVALID_HANDLE_VALUE.equals(hmdPipe.pipeHandle)) - throw new IOException("Can't open " + HMDPipeName + " pipe: " + Kernel32.INSTANCE.GetLastError()); - for (int i = 0; i < this.shareTrackers.size(); ++i) { - String pipeName = TrackersPipeName + i; - HANDLE pipeHandle = Kernel32.INSTANCE.CreateNamedPipe(pipeName, WinBase.PIPE_ACCESS_DUPLEX, // dwOpenMode + hmdPipe = new WindowsPipe( + Kernel32.INSTANCE + .CreateNamedPipe( + HMDPipeName, + WinBase.PIPE_ACCESS_DUPLEX, // dwOpenMode WinBase.PIPE_TYPE_BYTE | WinBase.PIPE_READMODE_BYTE | WinBase.PIPE_WAIT, // dwPipeMode 1, // nMaxInstances, 1024 * 16, // nOutBufferSize, 1024 * 16, // nInBufferSize, 0, // nDefaultTimeOut, - null); // lpSecurityAttributes + null + ), + HMDPipeName + ); // lpSecurityAttributes + LogManager.info("[VRBridge] Pipe " + hmdPipe.name + " created"); + if (WinBase.INVALID_HANDLE_VALUE.equals(hmdPipe.pipeHandle)) + throw new IOException( + "Can't open " + HMDPipeName + " pipe: " + Kernel32.INSTANCE.GetLastError() + ); + for (int i = 0; i < this.shareTrackers.size(); ++i) { + String pipeName = TrackersPipeName + i; + HANDLE pipeHandle = Kernel32.INSTANCE + .CreateNamedPipe( + pipeName, + WinBase.PIPE_ACCESS_DUPLEX, // dwOpenMode + WinBase.PIPE_TYPE_BYTE | WinBase.PIPE_READMODE_BYTE | WinBase.PIPE_WAIT, // dwPipeMode + 1, // nMaxInstances, + 1024 * 16, // nOutBufferSize, + 1024 * 16, // nInBufferSize, + 0, // nDefaultTimeOut, + null + ); // lpSecurityAttributes if (WinBase.INVALID_HANDLE_VALUE.equals(pipeHandle)) - throw new IOException("Can't open " + pipeName + " pipe: " + Kernel32.INSTANCE.GetLastError()); - LogManager.log.info("[VRBridge] Pipe " + pipeName + " created"); + throw new IOException( + "Can't open " + pipeName + " pipe: " + Kernel32.INSTANCE.GetLastError() + ); + LogManager.info("[VRBridge] Pipe " + pipeName + " created"); trackerPipes.add(new WindowsPipe(pipeHandle, pipeName)); } - LogManager.log.info("[VRBridge] Pipes are open"); + LogManager.info("[VRBridge] Pipes are open"); } catch (IOException e) { safeDisconnect(hmdPipe); for (WindowsPipe pipe : trackerPipes) { diff --git a/src/main/java/dev/slimevr/platform/windows/WindowsPipe.java b/src/main/java/dev/slimevr/platform/windows/WindowsPipe.java index 264f9904f..f29fafdc9 100644 --- a/src/main/java/dev/slimevr/platform/windows/WindowsPipe.java +++ b/src/main/java/dev/slimevr/platform/windows/WindowsPipe.java @@ -4,6 +4,7 @@ import com.sun.jna.platform.win32.Kernel32; import com.sun.jna.platform.win32.WinNT.HANDLE; import dev.slimevr.bridge.PipeState; + public class WindowsPipe { public final String name; @@ -19,7 +20,6 @@ public class WindowsPipe { try { if (pipe != null && pipe.pipeHandle != null) Kernel32.INSTANCE.DisconnectNamedPipe(pipe.pipeHandle); - } catch (Exception e) { - } + } catch (Exception e) {} } } diff --git a/src/main/java/dev/slimevr/platform/windows/WindowsSteamVRPipeInputBridge.java b/src/main/java/dev/slimevr/platform/windows/WindowsSteamVRPipeInputBridge.java index 1fea1e295..541c2325c 100644 --- a/src/main/java/dev/slimevr/platform/windows/WindowsSteamVRPipeInputBridge.java +++ b/src/main/java/dev/slimevr/platform/windows/WindowsSteamVRPipeInputBridge.java @@ -24,6 +24,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; + public class WindowsSteamVRPipeInputBridge extends Thread implements Bridge { public static final String PipeName = "\\\\.\\pipe\\SlimeVRInput"; @@ -73,9 +74,21 @@ public class WindowsSteamVRPipeInputBridge extends Thread implements Bridge { public boolean updatePipes() throws IOException { if (pipe.state == PipeState.OPEN) { IntByReference bytesAvailable = new IntByReference(0); - if (Kernel32.INSTANCE.PeekNamedPipe(pipe.pipeHandle, null, 0, null, bytesAvailable, null)) { + if ( + Kernel32.INSTANCE + .PeekNamedPipe(pipe.pipeHandle, null, 0, null, bytesAvailable, null) + ) { if (bytesAvailable.getValue() > 0) { - while (Kernel32.INSTANCE.ReadFile(pipe.pipeHandle, buffArray, buffArray.length, bytesAvailable, null)) { + while ( + Kernel32.INSTANCE + .ReadFile( + pipe.pipeHandle, + buffArray, + buffArray.length, + bytesAvailable, + null + ) + ) { int bytesRead = bytesAvailable.getValue(); for (int i = 0; i < bytesRead; ++i) { char c = (char) buffArray[i]; @@ -85,7 +98,10 @@ public class WindowsSteamVRPipeInputBridge extends Thread implements Bridge { } else { commandBuilder.append(c); if (commandBuilder.length() >= MAX_COMMAND_LENGTH) { - LogManager.log.severe("[SteamVRPipeInputBridge] Command from the pipe is too long, flushing buffer"); + LogManager + .severe( + "[SteamVRPipeInputBridge] Command from the pipe is too long, flushing buffer" + ); commandBuilder.setLength(0); } } @@ -99,7 +115,8 @@ public class WindowsSteamVRPipeInputBridge extends Thread implements Bridge { } // PeekNamedPipe or ReadFile returned an error pipe.state = PipeState.ERROR; - LogManager.log.severe("[SteamVRPipeInputBridge] Pipe error: " + Kernel32.INSTANCE.GetLastError()); + LogManager + .severe("[SteamVRPipeInputBridge] Pipe error: " + Kernel32.INSTANCE.GetLastError()); } return false; } @@ -109,10 +126,19 @@ public class WindowsSteamVRPipeInputBridge extends Thread implements Bridge { switch (command[0]) { case "ADD": // Add new tracker if (command.length < 4) { - LogManager.log.severe("[SteamVRPipeInputBridge] Error in ADD command. Command requires at least 4 arguments. Supplied: " + commandBuilder); + LogManager + .severe( + "[SteamVRPipeInputBridge] Error in ADD command. Command requires at least 4 arguments. Supplied: " + + commandBuilder + ); return; } - VRTracker internalTracker = new VRTracker(Integer.parseInt(command[1]), StringUtils.join(command, " ", 3, command.length), true, true); + VRTracker internalTracker = new VRTracker( + Integer.parseInt(command[1]), + StringUtils.join(command, " ", 3, command.length), + true, + true + ); int roleId = Integer.parseInt(command[2]); if (roleId >= 0 && roleId < SteamVRInputRoles.values.length) { SteamVRInputRoles svrRole = SteamVRInputRoles.values[roleId]; @@ -120,17 +146,26 @@ public class WindowsSteamVRPipeInputBridge extends Thread implements Bridge { } VRTracker oldTracker; synchronized (trackersInternal) { - oldTracker = trackersInternal.put(internalTracker.getTrackerId(), internalTracker); + oldTracker = trackersInternal + .put(internalTracker.getTrackerId(), internalTracker); } if (oldTracker != null) { - LogManager.log.severe("[SteamVRPipeInputBridge] New tracker added with the same id. Supplied: " + commandBuilder); + LogManager + .severe( + "[SteamVRPipeInputBridge] New tracker added with the same id. Supplied: " + + commandBuilder + ); return; } newData.set(true); break; case "UPD": // Update tracker data if (command.length < 9) { - LogManager.log.severe("[SteamVRPipeInputBridge] Error in UPD command. Command requires at least 9 arguments. Supplied: " + commandBuilder); + LogManager + .severe( + "[SteamVRPipeInputBridge] Error in UPD command. Command requires at least 9 arguments. Supplied: " + + commandBuilder + ); return; } int id = Integer.parseInt(command[1]); @@ -151,14 +186,22 @@ public class WindowsSteamVRPipeInputBridge extends Thread implements Bridge { break; case "STA": // Update tracker status if (command.length < 3) { - LogManager.log.severe("[SteamVRPipeInputBridge] Error in STA command. Command requires at least 3 arguments. Supplied: " + commandBuilder); + LogManager + .severe( + "[SteamVRPipeInputBridge] Error in STA command. Command requires at least 3 arguments. Supplied: " + + commandBuilder + ); return; } id = Integer.parseInt(command[1]); int status = Integer.parseInt(command[2]); TrackerStatus st = TrackerStatus.getById(status); if (st == null) { - LogManager.log.severe("[SteamVRPipeInputBridge] Unrecognized status id. Supplied: " + commandBuilder); + LogManager + .severe( + "[SteamVRPipeInputBridge] Unrecognized status id. Supplied: " + + commandBuilder + ); return; } internalTracker = trackersInternal.get(id); @@ -177,15 +220,19 @@ public class WindowsSteamVRPipeInputBridge extends Thread implements Bridge { // Add new trackers synchronized (trackersInternal) { Iterator iterator = trackersInternal.values().iterator(); - internal: - while (iterator.hasNext()) { + internal: while (iterator.hasNext()) { VRTracker internalTracker = iterator.next(); for (VRTracker t : trackers) { if (t.getTrackerId() == internalTracker.getTrackerId()) continue internal; } // Tracker is not found in current trackers - VRTracker tracker = new VRTracker(internalTracker.getTrackerId(), internalTracker.getName(), true, true); + VRTracker tracker = new VRTracker( + internalTracker.getTrackerId(), + internalTracker.getName(), + true, + true + ); tracker.bodyPosition = internalTracker.bodyPosition; trackers.add(tracker); server.registerTracker(tracker); @@ -195,7 +242,19 @@ public class WindowsSteamVRPipeInputBridge extends Thread implements Bridge { for (VRTracker tracker : trackers) { VRTracker internal = trackersInternal.get(tracker.getTrackerId()); if (internal == null) - throw new NullPointerException("Lost internal tracker somehow: " + tracker.getTrackerId()); // Shouln't really happen even, but better to catch it like this + throw new NullPointerException( + "Lost internal tracker somehow: " + tracker.getTrackerId() + ); // Shouln't + // really + // happen + // even, + // but + // better + // to + // catch + // it + // like + // this if (internal.getPosition(vBuffer)) tracker.position.set(vBuffer); if (internal.getRotation(qBuffer)) @@ -214,33 +273,51 @@ public class WindowsSteamVRPipeInputBridge extends Thread implements Bridge { private void resetPipe() { WindowsPipe.safeDisconnect(pipe); pipe.state = PipeState.CREATED; - //Main.vrServer.queueTask(this::disconnected); + // Main.vrServer.queueTask(this::disconnected); } private boolean tryOpeningPipe(WindowsPipe pipe) { - if (Kernel32.INSTANCE.ConnectNamedPipe(pipe.pipeHandle, null) || Kernel32.INSTANCE.GetLastError() == WinError.ERROR_PIPE_CONNECTED) { + if ( + Kernel32.INSTANCE.ConnectNamedPipe(pipe.pipeHandle, null) + || Kernel32.INSTANCE.GetLastError() == WinError.ERROR_PIPE_CONNECTED + ) { pipe.state = PipeState.OPEN; - LogManager.log.info("[SteamVRPipeInputBridge] Pipe " + pipe.name + " is open"); + LogManager.info("[SteamVRPipeInputBridge] Pipe " + pipe.name + " is open"); return true; } - LogManager.log.info("[SteamVRPipeInputBridge] Error connecting to pipe " + pipe.name + ": " + Kernel32.INSTANCE.GetLastError()); + LogManager + .info( + "[SteamVRPipeInputBridge] Error connecting to pipe " + + pipe.name + + ": " + + Kernel32.INSTANCE.GetLastError() + ); return false; } private void createPipes() throws IOException { try { - pipe = new WindowsPipe(Kernel32.INSTANCE.CreateNamedPipe(PipeName, WinBase.PIPE_ACCESS_DUPLEX, // dwOpenMode - WinBase.PIPE_TYPE_BYTE | WinBase.PIPE_READMODE_BYTE | WinBase.PIPE_WAIT, // dwPipeMode - 1, // nMaxInstances, - 1024 * 16, // nOutBufferSize, - 1024 * 16, // nInBufferSize, - 0, // nDefaultTimeOut, - null), PipeName); // lpSecurityAttributes - LogManager.log.info("[SteamVRPipeInputBridge] Pipe " + pipe.name + " created"); + pipe = new WindowsPipe( + Kernel32.INSTANCE + .CreateNamedPipe( + PipeName, + WinBase.PIPE_ACCESS_DUPLEX, // dwOpenMode + WinBase.PIPE_TYPE_BYTE | WinBase.PIPE_READMODE_BYTE | WinBase.PIPE_WAIT, // dwPipeMode + 1, // nMaxInstances, + 1024 * 16, // nOutBufferSize, + 1024 * 16, // nInBufferSize, + 0, // nDefaultTimeOut, + null + ), + PipeName + ); // lpSecurityAttributes + LogManager.info("[SteamVRPipeInputBridge] Pipe " + pipe.name + " created"); if (WinBase.INVALID_HANDLE_VALUE.equals(pipe.pipeHandle)) - throw new IOException("Can't open " + PipeName + " pipe: " + Kernel32.INSTANCE.GetLastError()); - LogManager.log.info("[SteamVRPipeInputBridge] Pipes are open"); + throw new IOException( + "Can't open " + PipeName + " pipe: " + Kernel32.INSTANCE.GetLastError() + ); + LogManager.info("[SteamVRPipeInputBridge] Pipes are open"); } catch (IOException e) { WindowsPipe.safeDisconnect(pipe); throw e; @@ -265,20 +342,13 @@ public class WindowsSteamVRPipeInputBridge extends Thread implements Bridge { } public enum SteamVRInputRoles { - HEAD(TrackerPosition.HMD), - LEFT_HAND(TrackerPosition.LEFT_CONTROLLER), - RIGHT_HAND(TrackerPosition.RIGHT_CONTROLLER), - LEFT_FOOT(TrackerPosition.LEFT_FOOT), - RIGHT_FOOT(TrackerPosition.RIGHT_FOOT), - LEFT_SHOULDER(TrackerPosition.NONE), - RIGHT_SHOULDER(TrackerPosition.NONE), - LEFT_ELBOW(TrackerPosition.LEFT_FOREARM), - RIGHT_ELBOW(TrackerPosition.RIGHT_FOREARM), - LEFT_KNEE(TrackerPosition.LEFT_KNEE), - RIGHT_KNEE(TrackerPosition.RIGHT_KNEE), - WAIST(TrackerPosition.WAIST), - CHEST(TrackerPosition.CHEST), - ; + HEAD(TrackerPosition.HMD), LEFT_HAND(TrackerPosition.LEFT_CONTROLLER), + RIGHT_HAND(TrackerPosition.RIGHT_CONTROLLER), LEFT_FOOT(TrackerPosition.LEFT_FOOT), + RIGHT_FOOT(TrackerPosition.RIGHT_FOOT), LEFT_SHOULDER(TrackerPosition.NONE), + RIGHT_SHOULDER(TrackerPosition.NONE), LEFT_ELBOW(TrackerPosition.LEFT_FOREARM), + RIGHT_ELBOW(TrackerPosition.RIGHT_FOREARM), LEFT_KNEE(TrackerPosition.LEFT_KNEE), + RIGHT_KNEE(TrackerPosition.RIGHT_KNEE), WAIST(TrackerPosition.WAIST), + CHEST(TrackerPosition.CHEST),; private static final SteamVRInputRoles[] values = values(); public final TrackerPosition bodyPosition; diff --git a/src/main/java/dev/slimevr/poserecorder/BVHRecorder.java b/src/main/java/dev/slimevr/poserecorder/BVHRecorder.java index d0c20ae01..d776baab4 100644 --- a/src/main/java/dev/slimevr/poserecorder/BVHRecorder.java +++ b/src/main/java/dev/slimevr/poserecorder/BVHRecorder.java @@ -9,6 +9,7 @@ import io.eiren.util.logging.LogManager; import java.io.File; import java.io.IOException; + public class BVHRecorder { private static final File bvhSaveDir = new File("BVH Recordings"); @@ -26,10 +27,13 @@ public class BVHRecorder { poseDataStream = new BVHFileStream(bvhFile); poseStreamer.setOutput(poseDataStream, 1000L / 100L); } catch (IOException e1) { - LogManager.log.severe("[BVH] Failed to create the recording file \"" + bvhFile.getPath() + "\"."); + LogManager + .severe( + "[BVH] Failed to create the recording file \"" + bvhFile.getPath() + "\"." + ); } } else { - LogManager.log.severe("[BVH] Unable to get file to save to"); + LogManager.severe("[BVH] Unable to get file to save to"); } } @@ -38,7 +42,7 @@ public class BVHRecorder { try { poseStreamer.closeOutput(poseDataStream); } catch (Exception e1) { - LogManager.log.severe("[BVH] Exception while closing poseDataStream", e1); + LogManager.severe("[BVH] Exception while closing poseDataStream", e1); } finally { poseDataStream = null; } @@ -54,7 +58,12 @@ public class BVHRecorder { return saveRecording; } else { - LogManager.log.severe("[BVH] Failed to create the recording directory \"" + bvhSaveDir.getPath() + "\"."); + LogManager + .severe( + "[BVH] Failed to create the recording directory \"" + + bvhSaveDir.getPath() + + "\"." + ); } return null; diff --git a/src/main/java/dev/slimevr/poserecorder/PoseFrameIO.java b/src/main/java/dev/slimevr/poserecorder/PoseFrameIO.java index f4220c659..7aeb69669 100644 --- a/src/main/java/dev/slimevr/poserecorder/PoseFrameIO.java +++ b/src/main/java/dev/slimevr/poserecorder/PoseFrameIO.java @@ -8,6 +8,7 @@ import io.eiren.util.logging.LogManager; import java.io.*; + public final class PoseFrameIO { private PoseFrameIO() { @@ -52,7 +53,7 @@ public final class PoseFrameIO { outputStream.writeInt(0); } } catch (Exception e) { - LogManager.log.severe("Error writing frame to stream", e); + LogManager.severe("Error writing frame to stream", e); return false; } @@ -60,10 +61,14 @@ public final class PoseFrameIO { } public static boolean writeToFile(File file, PoseFrames frames) { - try (DataOutputStream outputStream = new DataOutputStream(new BufferedOutputStream(new FileOutputStream(file)))) { + try ( + DataOutputStream outputStream = new DataOutputStream( + new BufferedOutputStream(new FileOutputStream(file)) + ) + ) { writeFrames(outputStream, frames); } catch (Exception e) { - LogManager.log.severe("Error writing frames to file", e); + LogManager.severe("Error writing frames to file", e); return false; } @@ -79,7 +84,9 @@ public final class PoseFrameIO { String name = inputStream.readUTF(); int trackerFrameCount = inputStream.readInt(); - FastList trackerFrames = new FastList(trackerFrameCount); + FastList trackerFrames = new FastList( + trackerFrameCount + ); for (int j = 0; j < trackerFrameCount; j++) { int dataFlags = inputStream.readInt(); @@ -113,7 +120,7 @@ public final class PoseFrameIO { return new PoseFrames(trackers); } catch (Exception e) { - LogManager.log.severe("Error reading frame from stream", e); + LogManager.severe("Error reading frame from stream", e); } return null; @@ -121,9 +128,11 @@ public final class PoseFrameIO { public static PoseFrames readFromFile(File file) { try { - return readFrames(new DataInputStream(new BufferedInputStream(new FileInputStream(file)))); + return readFrames( + new DataInputStream(new BufferedInputStream(new FileInputStream(file))) + ); } catch (Exception e) { - LogManager.log.severe("Error reading frame from file", e); + LogManager.severe("Error reading frame from file", e); } return null; diff --git a/src/main/java/dev/slimevr/poserecorder/PoseFrameSkeleton.java b/src/main/java/dev/slimevr/poserecorder/PoseFrameSkeleton.java index 6f5afc8d0..dc31a6f43 100644 --- a/src/main/java/dev/slimevr/poserecorder/PoseFrameSkeleton.java +++ b/src/main/java/dev/slimevr/poserecorder/PoseFrameSkeleton.java @@ -9,6 +9,7 @@ import dev.slimevr.vr.trackers.Tracker; import java.util.List; import java.util.Map; + public class PoseFrameSkeleton extends SimpleSkeleton { private int frameCursor = 0; @@ -17,19 +18,34 @@ public class PoseFrameSkeleton extends SimpleSkeleton { super(computedTrackers); } - public PoseFrameSkeleton(VRServer server, List computedTrackers) { + public PoseFrameSkeleton( + VRServer server, + List computedTrackers + ) { super(server, computedTrackers); } - public PoseFrameSkeleton(List trackers, List computedTrackers) { + public PoseFrameSkeleton( + List trackers, + List computedTrackers + ) { super(trackers, computedTrackers); } - public PoseFrameSkeleton(List trackers, List computedTrackers, Map configs, Map altConfigs) { + public PoseFrameSkeleton( + List trackers, + List computedTrackers, + Map configs, + Map altConfigs + ) { super(trackers, computedTrackers, configs, altConfigs); } - public PoseFrameSkeleton(List trackers, List computedTrackers, Map configs) { + public PoseFrameSkeleton( + List trackers, + List computedTrackers, + Map configs + ) { super(trackers, computedTrackers, configs); } diff --git a/src/main/java/dev/slimevr/poserecorder/PoseFrameTracker.java b/src/main/java/dev/slimevr/poserecorder/PoseFrameTracker.java index 6b22bf2fa..eb84b03c8 100644 --- a/src/main/java/dev/slimevr/poserecorder/PoseFrameTracker.java +++ b/src/main/java/dev/slimevr/poserecorder/PoseFrameTracker.java @@ -6,11 +6,12 @@ import dev.slimevr.vr.trackers.Tracker; import dev.slimevr.vr.trackers.TrackerConfig; import dev.slimevr.vr.trackers.TrackerPosition; import dev.slimevr.vr.trackers.TrackerStatus; -import dev.slimevr.vr.trackers.udp.Device; +import dev.slimevr.vr.trackers.udp.UDPDevice; import io.eiren.util.collections.FastList; import java.util.Iterator; + public class PoseFrameTracker implements Tracker, Iterable { public final String name; @@ -136,7 +137,7 @@ public class PoseFrameTracker implements Tracker, Iterable { return safeGetFrame(frameCursor); } - //#region Tracker Interface Implementation + // #region Tracker Interface Implementation @Override public boolean getRotation(Quaternion store) { TrackerFrame frame = safeGetFrame(); @@ -173,12 +174,16 @@ public class PoseFrameTracker implements Tracker, Iterable { @Override public void loadConfig(TrackerConfig config) { - throw new UnsupportedOperationException("PoseFrameTracker does not implement configuration"); + throw new UnsupportedOperationException( + "PoseFrameTracker does not implement configuration" + ); } @Override public void saveConfig(TrackerConfig config) { - throw new UnsupportedOperationException("PoseFrameTracker does not implement configuration"); + throw new UnsupportedOperationException( + "PoseFrameTracker does not implement configuration" + ); } @Override @@ -209,7 +214,9 @@ public class PoseFrameTracker implements Tracker, Iterable { @Override public void setBodyPosition(TrackerPosition position) { - throw new UnsupportedOperationException("PoseFrameTracker does not allow setting the body position"); + throw new UnsupportedOperationException( + "PoseFrameTracker does not allow setting the body position" + ); } @Override @@ -233,7 +240,7 @@ public class PoseFrameTracker implements Tracker, Iterable { public boolean isComputed() { return true; } - //#endregion + // #endregion @Override public Iterator iterator() { @@ -251,7 +258,7 @@ public class PoseFrameTracker implements Tracker, Iterable { } @Override - public Device getDevice() { + public UDPDevice getDevice() { return null; } } diff --git a/src/main/java/dev/slimevr/poserecorder/PoseFrames.java b/src/main/java/dev/slimevr/poserecorder/PoseFrames.java index ecbd82d56..29306cf28 100644 --- a/src/main/java/dev/slimevr/poserecorder/PoseFrames.java +++ b/src/main/java/dev/slimevr/poserecorder/PoseFrames.java @@ -8,12 +8,14 @@ import java.util.Iterator; import java.util.List; import java.util.NoSuchElementException; + public final class PoseFrames implements Iterable { private final FastList trackers; /** - * Creates a {@link PoseFrames} object with the provided list of {@link PoseFrameTracker}s as the internal {@link PoseFrameTracker} list + * Creates a {@link PoseFrames} object with the provided list of + * {@link PoseFrameTracker}s as the internal {@link PoseFrameTracker} list * * @see {@link FastList}, {@link PoseFrameTracker} */ @@ -22,7 +24,8 @@ public final class PoseFrames implements Iterable { } /** - * Creates a {@link PoseFrames} object with the specified initial tracker capacity + * Creates a {@link PoseFrames} object with the specified initial tracker + * capacity * * @see {@link #PoseFrames(FastList)} */ @@ -31,7 +34,8 @@ public final class PoseFrames implements Iterable { } /** - * Creates a {@link PoseFrames} object with the default initial tracker capacity of {@code 5} + * Creates a {@link PoseFrames} object with the default initial tracker + * capacity of {@code 5} * * @see {@link #PoseFrames(int)} */ @@ -40,7 +44,8 @@ public final class PoseFrames implements Iterable { } /** - * Adds the provided {@link PoseFrameTracker} into the internal {@link PoseFrameTracker} list + * Adds the provided {@link PoseFrameTracker} into the internal + * {@link PoseFrameTracker} list * * @return The {@link PoseFrameTracker} provided * @see {@link List#add(Object)}, {@link PoseFrameTracker} @@ -51,7 +56,8 @@ public final class PoseFrames implements Iterable { } /** - * Removes the {@link PoseFrameTracker} at the specified index from the internal {@link PoseFrameTracker} list + * Removes the {@link PoseFrameTracker} at the specified index from the + * internal {@link PoseFrameTracker} list * * @return The {@link PoseFrameTracker} previously at the specified index * @see {@link List#remove(int)}, {@link PoseFrameTracker} @@ -61,9 +67,11 @@ public final class PoseFrames implements Iterable { } /** - * Removes the specified {@link PoseFrameTracker} from the internal {@link PoseFrameTracker} list + * Removes the specified {@link PoseFrameTracker} from the internal + * {@link PoseFrameTracker} list * - * @return {@code true} if the internal {@link PoseFrameTracker} list contained the specified {@link PoseFrameTracker} + * @return {@code true} if the internal {@link PoseFrameTracker} list + * contained the specified {@link PoseFrameTracker} * @see {@link List#remove(Object)}, {@link PoseFrameTracker} */ public boolean removeTracker(PoseFrameTracker tracker) { @@ -80,7 +88,8 @@ public final class PoseFrames implements Iterable { } /** - * Fake clears the internal {@link PoseFrameTracker} list by setting the size to zero + * Fake clears the internal {@link PoseFrameTracker} list by setting the + * size to zero * * @see {@link FastList#fakeClear()}, {@link PoseFrameTracker} */ @@ -104,12 +113,14 @@ public final class PoseFrames implements Iterable { return trackers; } - //#region Data Utilities + // #region Data Utilities /** - * A utility function to get the maximum Y value of the tracker associated with the {@link TrackerPosition#HMD} tracker position + * A utility function to get the maximum Y value of the tracker associated + * with the {@link TrackerPosition#HMD} tracker position * - * @return The maximum Y value of the tracker associated with the {@link TrackerPosition#HMD} tracker position + * @return The maximum Y value of the tracker associated with the + * {@link TrackerPosition#HMD} tracker position * @see {@link #getMaxHeight(TrackerPosition)}, {@link TrackerPosition#HMD} */ public float getMaxHmdHeight() { @@ -117,9 +128,11 @@ public final class PoseFrames implements Iterable { } /** - * A utility function to get the maximum Y value of the tracker associated with the specified {@link TrackerPosition} + * A utility function to get the maximum Y value of the tracker associated + * with the specified {@link TrackerPosition} * - * @return The maximum Y value of the tracker associated with the specified {@link TrackerPosition} + * @return The maximum Y value of the tracker associated with the specified + * {@link TrackerPosition} * @see {@link TrackerPosition} */ public float getMaxHeight(TrackerPosition trackerPosition) { @@ -139,10 +152,11 @@ public final class PoseFrames implements Iterable { return maxHeight; } - //#endregion + // #endregion /** - * @return The maximum number of {@link TrackerFrame}s contained within each {@link PoseFrameTracker} in the internal {@link PoseFrameTracker} list + * @return The maximum number of {@link TrackerFrame}s contained within each + * {@link PoseFrameTracker} in the internal {@link PoseFrameTracker} list * @see {@link PoseFrameTracker#getFrameCount()}, {@link PoseFrameTracker} */ public int getMaxFrameCount() { @@ -158,10 +172,13 @@ public final class PoseFrames implements Iterable { } /** - * Using the provided array buffer, get the {@link TrackerFrame}s contained within each {@link PoseFrameTracker} in the internal {@link PoseFrameTracker} list at the specified index + * Using the provided array buffer, get the {@link TrackerFrame}s contained + * within each {@link PoseFrameTracker} in the internal + * {@link PoseFrameTracker} list at the specified index * * @return The number of frames written to the buffer - * @see {@link PoseFrameTracker#safeGetFrame(int)}, {@link TrackerFrame}, {@link PoseFrameTracker} + * @see {@link PoseFrameTracker#safeGetFrame(int)}, {@link TrackerFrame}, + * {@link PoseFrameTracker} */ public int getFrames(int frameIndex, TrackerFrame[] buffer) { int frameCount = 0; @@ -184,10 +201,14 @@ public final class PoseFrames implements Iterable { } /** - * Using the provided {@link List} buffer, get the {@link TrackerFrame}s contained within each {@link PoseFrameTracker} in the internal {@link PoseFrameTracker} list at the specified index + * Using the provided {@link List} buffer, get the {@link TrackerFrame}s + * contained within each {@link PoseFrameTracker} in the internal + * {@link PoseFrameTracker} list at the specified index * * @return The number of frames written to the buffer - * @see {@link PoseFrameTracker#safeGetFrame(int)}, {@link List#set(int, Object)}, {@link TrackerFrame}, {@link PoseFrameTracker} + * @see {@link PoseFrameTracker#safeGetFrame(int)}, + * {@link List#set(int, Object)}, {@link TrackerFrame}, + * {@link PoseFrameTracker} */ public int getFrames(int frameIndex, List buffer) { int frameCount = 0; @@ -210,8 +231,11 @@ public final class PoseFrames implements Iterable { } /** - * @return The {@link TrackerFrame}s contained within each {@link PoseFrameTracker} in the internal {@link PoseFrameTracker} list at the specified index - * @see {@link PoseFrameTracker#safeGetFrame(int)}, {@link TrackerFrame}, {@link PoseFrameTracker} + * @return The {@link TrackerFrame}s contained within each + * {@link PoseFrameTracker} in the internal {@link PoseFrameTracker} list at + * the specified index + * @see {@link PoseFrameTracker#safeGetFrame(int)}, {@link TrackerFrame}, + * {@link PoseFrameTracker} */ public TrackerFrame[] getFrames(int frameIndex) { TrackerFrame[] trackerFrames = new TrackerFrame[trackers.size()]; diff --git a/src/main/java/dev/slimevr/poserecorder/PoseRecorder.java b/src/main/java/dev/slimevr/poserecorder/PoseRecorder.java index b0a76c87f..bcc539d35 100644 --- a/src/main/java/dev/slimevr/poserecorder/PoseRecorder.java +++ b/src/main/java/dev/slimevr/poserecorder/PoseRecorder.java @@ -12,6 +12,7 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; + public class PoseRecorder { protected final VRServer server; @@ -53,15 +54,18 @@ public class PoseRecorder { nextFrameTimeMs += frameRecordingInterval; - // To prevent duplicate frames, make sure the frame time is always in the future + // To prevent duplicate frames, make sure the frame time is always in + // the future if (nextFrameTimeMs <= curTime) { nextFrameTimeMs = curTime + frameRecordingInterval; } - // Make sure it's synchronized since this is the server thread interacting with + // Make sure it's synchronized since this is the server thread + // interacting with // an unknown outside thread controlling this class synchronized (this) { - // A stopped recording will be accounted for by an empty "trackers" list + // A stopped recording will be accounted for by an empty "trackers" + // list int cursor = frameCursor++; for (Pair tracker : trackers) { // Add a frame for each tracker @@ -79,7 +83,11 @@ public class PoseRecorder { return startFrameRecording(numFrames, intervalMs, server.getAllTrackers()); } - public synchronized Future startFrameRecording(int numFrames, long intervalMs, List trackers) { + public synchronized Future startFrameRecording( + int numFrames, + long intervalMs, + List trackers + ) { if (numFrames < 1) { throw new IllegalArgumentException("numFrames must at least have a value of 1"); } @@ -122,7 +130,14 @@ public class PoseRecorder { frameRecordingInterval = intervalMs; nextFrameTimeMs = -1L; - LogManager.log.info("[PoseRecorder] Recording " + numFrames + " samples at a " + intervalMs + " ms frame interval"); + LogManager + .info( + "[PoseRecorder] Recording " + + numFrames + + " samples at a " + + intervalMs + + " ms frame interval" + ); currentRecording = new CompletableFuture(); return currentRecording; diff --git a/src/main/java/dev/slimevr/poserecorder/TrackerFrame.java b/src/main/java/dev/slimevr/poserecorder/TrackerFrame.java index b66783e91..afcaca9e6 100644 --- a/src/main/java/dev/slimevr/poserecorder/TrackerFrame.java +++ b/src/main/java/dev/slimevr/poserecorder/TrackerFrame.java @@ -6,7 +6,8 @@ import dev.slimevr.vr.trackers.Tracker; import dev.slimevr.vr.trackers.TrackerConfig; import dev.slimevr.vr.trackers.TrackerPosition; import dev.slimevr.vr.trackers.TrackerStatus; -import dev.slimevr.vr.trackers.udp.Device; +import dev.slimevr.vr.trackers.udp.UDPDevice; + public final class TrackerFrame implements Tracker { @@ -39,7 +40,11 @@ public final class TrackerFrame implements Tracker { } // If the tracker is not ready - if (tracker.getStatus() != TrackerStatus.OK && tracker.getStatus() != TrackerStatus.BUSY && tracker.getStatus() != TrackerStatus.OCCLUDED) { + if ( + tracker.getStatus() != TrackerStatus.OK + && tracker.getStatus() != TrackerStatus.BUSY + && tracker.getStatus() != TrackerStatus.OCCLUDED + ) { return null; } @@ -77,7 +82,7 @@ public final class TrackerFrame implements Tracker { return flag.check(dataFlags); } - //#region Tracker Interface Implementation + // #region Tracker Interface Implementation @Override public boolean getRotation(Quaternion store) { if (hasData(TrackerFrameData.ROTATION)) { @@ -147,7 +152,9 @@ public final class TrackerFrame implements Tracker { @Override public void setBodyPosition(TrackerPosition position) { - throw new UnsupportedOperationException("TrackerFrame does not allow setting the body position"); + throw new UnsupportedOperationException( + "TrackerFrame does not allow setting the body position" + ); } @Override @@ -169,7 +176,7 @@ public final class TrackerFrame implements Tracker { public boolean isComputed() { return true; } - //#endregion + // #endregion @Override public int getTrackerId() { @@ -182,7 +189,7 @@ public final class TrackerFrame implements Tracker { } @Override - public Device getDevice() { + public UDPDevice getDevice() { return null; } } diff --git a/src/main/java/dev/slimevr/poserecorder/TrackerFrameData.java b/src/main/java/dev/slimevr/poserecorder/TrackerFrameData.java index ecc7a724a..e000a25e0 100644 --- a/src/main/java/dev/slimevr/poserecorder/TrackerFrameData.java +++ b/src/main/java/dev/slimevr/poserecorder/TrackerFrameData.java @@ -2,10 +2,7 @@ package dev.slimevr.poserecorder; public enum TrackerFrameData { - DESIGNATION(0), - ROTATION(1), - POSITION(2), - ; + DESIGNATION(0), ROTATION(1), POSITION(2),; public final int flag; diff --git a/src/main/java/dev/slimevr/posestreamer/BVHFileStream.java b/src/main/java/dev/slimevr/posestreamer/BVHFileStream.java index 001badf5b..26e1500d7 100644 --- a/src/main/java/dev/slimevr/posestreamer/BVHFileStream.java +++ b/src/main/java/dev/slimevr/posestreamer/BVHFileStream.java @@ -10,6 +10,7 @@ import org.apache.commons.lang3.StringUtils; import java.io.*; + public class BVHFileStream extends PoseDataStream { private static final int LONG_MAX_VALUE_DIGITS = Long.toString(Long.MAX_VALUE).length(); @@ -96,7 +97,17 @@ public class BVHFileStream extends PoseDataStream { if (level > 0 && node.wrappedNode.getParent() != null) { Vector3f offset = node.localTransform.getTranslation(); float reverseMultiplier = node.hasReversedHierarchy() ? -1 : 1; - writer.write(nextIndentLevel + "OFFSET " + offset.getX() * OFFSET_SCALE * reverseMultiplier + " " + offset.getY() * OFFSET_SCALE * reverseMultiplier + " " + offset.getZ() * OFFSET_SCALE * reverseMultiplier + "\n"); + writer + .write( + nextIndentLevel + + "OFFSET " + + offset.getX() * OFFSET_SCALE * reverseMultiplier + + " " + + offset.getY() * OFFSET_SCALE * reverseMultiplier + + " " + + offset.getZ() * OFFSET_SCALE * reverseMultiplier + + "\n" + ); } else { writer.write(nextIndentLevel + "OFFSET 0.0 0.0 0.0\n"); } @@ -107,7 +118,11 @@ public class BVHFileStream extends PoseDataStream { if (level > 0) { writer.write(nextIndentLevel + "CHANNELS 3 Zrotation Xrotation Yrotation\n"); } else { - writer.write(nextIndentLevel + "CHANNELS 6 Xposition Yposition Zposition Zrotation Xrotation Yrotation\n"); + writer + .write( + nextIndentLevel + + "CHANNELS 6 Xposition Yposition Zposition Zrotation Xrotation Yrotation\n" + ); } for (TransformNodeWrapper childNode : node.children) { @@ -147,7 +162,8 @@ public class BVHFileStream extends PoseDataStream { writer.write("Frame Time: " + (streamer.getFrameInterval() / 1000d) + "\n"); } - // Roughly based off code from https://github.com/TrackLab/ViRe/blob/50a987eff4db31036b2ebaeb5a28983cd473f267/Assets/Scripts/BVH/BVHRecorder.cs + // Roughly based off code from + // https://github.com/TrackLab/ViRe/blob/50a987eff4db31036b2ebaeb5a28983cd473f267/Assets/Scripts/BVH/BVHRecorder.cs private float[] quatToXyzAngles(Quaternion q, float[] angles) { if (angles == null) { angles = new float[3]; @@ -168,7 +184,10 @@ public class BVHFileStream extends PoseDataStream { // Pitch (Y) float sinp = 2f * (y * z + w * x); // Use 90 degrees if out of range - angles[1] = FastMath.abs(sinp) >= 1f ? FastMath.copysign(FastMath.PI / 2f, sinp) : FastMath.asin(sinp); + angles[1] = FastMath.abs(sinp) >= 1f + ? FastMath.copysign(FastMath.PI / 2f, sinp) + : FastMath + .asin(sinp); // Yaw (Z) float sinyCosp = -2f * (x * z - w * y); @@ -178,20 +197,17 @@ public class BVHFileStream extends PoseDataStream { return angles; } - private void writeNodeHierarchyRotation(TransformNodeWrapper node, Quaternion inverseRootRot) throws IOException { + private void writeNodeHierarchyRotation(TransformNodeWrapper node, Quaternion inverseRootRot) + throws IOException { Transform transform = node.worldTransform; - + /* - if (node.hasReversedHierarchy()) { - for (TransformNodeWrapper childNode : node.children) { - // If the hierarchy is fully reversed, set the rotation for the upper bone - if (childNode.hasReversedHierarchy()) { - transform = childNode.worldTransform; - break; - } - } - } - */ + * if (node.hasReversedHierarchy()) { for (TransformNodeWrapper + * childNode : node.children) { // If the hierarchy is fully reversed, + * set the rotation for the upper bone if + * (childNode.hasReversedHierarchy()) { transform = + * childNode.worldTransform; break; } } } + */ rotBuf = transform.getRotation(rotBuf); @@ -207,7 +223,14 @@ public class BVHFileStream extends PoseDataStream { angleBuf = quatToXyzAngles(rotBuf.normalizeLocal(), angleBuf); // Output in order of roll (Z), pitch (X), yaw (Y) (extrinsic) - writer.write(angleBuf[0] * FastMath.RAD_TO_DEG + " " + angleBuf[1] * FastMath.RAD_TO_DEG + " " + angleBuf[2] * FastMath.RAD_TO_DEG); + writer + .write( + angleBuf[0] * FastMath.RAD_TO_DEG + + " " + + angleBuf[1] * FastMath.RAD_TO_DEG + + " " + + angleBuf[2] * FastMath.RAD_TO_DEG + ); // Get inverse rotation for child local rotations if (!node.children.isEmpty()) { @@ -236,7 +259,15 @@ public class BVHFileStream extends PoseDataStream { Vector3f rootPos = rootNode.worldTransform.getTranslation(); // Write root position - writer.write(rootPos.getX() * POSITION_SCALE + " " + rootPos.getY() * POSITION_SCALE + " " + rootPos.getZ() * POSITION_SCALE + " "); + writer + .write( + rootPos.getX() * POSITION_SCALE + + " " + + rootPos.getY() * POSITION_SCALE + + " " + + rootPos.getZ() * POSITION_SCALE + + " " + ); writeNodeHierarchyRotation(rootNode, null); writer.newLine(); diff --git a/src/main/java/dev/slimevr/posestreamer/PoseDataStream.java b/src/main/java/dev/slimevr/posestreamer/PoseDataStream.java index 8d5a941bf..c4e7f72fe 100644 --- a/src/main/java/dev/slimevr/posestreamer/PoseDataStream.java +++ b/src/main/java/dev/slimevr/posestreamer/PoseDataStream.java @@ -4,6 +4,7 @@ import dev.slimevr.vr.processor.skeleton.HumanSkeleton; import java.io.*; + public abstract class PoseDataStream implements AutoCloseable { protected final OutputStream outputStream; diff --git a/src/main/java/dev/slimevr/posestreamer/PoseFrameStreamer.java b/src/main/java/dev/slimevr/posestreamer/PoseFrameStreamer.java index 9f6e8a1b0..18a4d199b 100644 --- a/src/main/java/dev/slimevr/posestreamer/PoseFrameStreamer.java +++ b/src/main/java/dev/slimevr/posestreamer/PoseFrameStreamer.java @@ -6,6 +6,7 @@ import dev.slimevr.poserecorder.PoseFrames; import java.io.File; + public class PoseFrameStreamer extends PoseStreamer { private final PoseFrames frames; diff --git a/src/main/java/dev/slimevr/posestreamer/PoseStreamer.java b/src/main/java/dev/slimevr/posestreamer/PoseStreamer.java index 9e60dafdb..2ee450d96 100644 --- a/src/main/java/dev/slimevr/posestreamer/PoseStreamer.java +++ b/src/main/java/dev/slimevr/posestreamer/PoseStreamer.java @@ -5,6 +5,7 @@ import io.eiren.util.logging.LogManager; import java.io.IOException; + public class PoseStreamer { protected long frameRecordingInterval = 60L; @@ -26,7 +27,7 @@ public class PoseStreamer { poseFileStream.writeFrame(skeleton); } catch (Exception e) { // Handle any exceptions without crashing the program - LogManager.log.severe("[PoseStreamer] Exception while saving frame", e); + LogManager.severe("[PoseStreamer] Exception while saving frame", e); } } @@ -46,7 +47,8 @@ public class PoseStreamer { return skeleton; } - public synchronized void setOutput(PoseDataStream poseFileStream, long intervalMs) throws IOException { + public synchronized void setOutput(PoseDataStream poseFileStream, long intervalMs) + throws IOException { setFrameInterval(intervalMs); setOutput(poseFileStream); } diff --git a/src/main/java/dev/slimevr/posestreamer/ServerPoseStreamer.java b/src/main/java/dev/slimevr/posestreamer/ServerPoseStreamer.java index 2069501a0..a644c06d0 100644 --- a/src/main/java/dev/slimevr/posestreamer/ServerPoseStreamer.java +++ b/src/main/java/dev/slimevr/posestreamer/ServerPoseStreamer.java @@ -4,6 +4,7 @@ import dev.slimevr.VRServer; import dev.slimevr.util.ann.VRServerThread; import dev.slimevr.vr.processor.skeleton.HumanSkeleton; + public class ServerPoseStreamer extends TickPoseStreamer { protected final VRServer server; diff --git a/src/main/java/dev/slimevr/posestreamer/StdBVHFileStream.java b/src/main/java/dev/slimevr/posestreamer/StdBVHFileStream.java index e61077627..b2e1692b9 100644 --- a/src/main/java/dev/slimevr/posestreamer/StdBVHFileStream.java +++ b/src/main/java/dev/slimevr/posestreamer/StdBVHFileStream.java @@ -6,6 +6,7 @@ import java.io.File; import java.io.FileNotFoundException; import java.io.OutputStream; + public class StdBVHFileStream extends BVHFileStream { public StdBVHFileStream(OutputStream outputStream) { diff --git a/src/main/java/dev/slimevr/posestreamer/TickPoseStreamer.java b/src/main/java/dev/slimevr/posestreamer/TickPoseStreamer.java index 91cfedaea..946fb4137 100644 --- a/src/main/java/dev/slimevr/posestreamer/TickPoseStreamer.java +++ b/src/main/java/dev/slimevr/posestreamer/TickPoseStreamer.java @@ -4,6 +4,7 @@ import dev.slimevr.vr.processor.skeleton.HumanSkeleton; import java.io.IOException; + public class TickPoseStreamer extends PoseStreamer { protected long nextFrameTimeMs = -1L; @@ -30,7 +31,8 @@ public class TickPoseStreamer extends PoseStreamer { nextFrameTimeMs += frameRecordingInterval; - // To prevent duplicate frames, make sure the frame time is always in the future + // To prevent duplicate frames, make sure the frame time is always in + // the future if (nextFrameTimeMs <= curTime) { nextFrameTimeMs = curTime + frameRecordingInterval; } diff --git a/src/main/java/dev/slimevr/posestreamer/TransformNodeWrapper.java b/src/main/java/dev/slimevr/posestreamer/TransformNodeWrapper.java index 9ff50870d..df62fe309 100644 --- a/src/main/java/dev/slimevr/posestreamer/TransformNodeWrapper.java +++ b/src/main/java/dev/slimevr/posestreamer/TransformNodeWrapper.java @@ -7,6 +7,7 @@ import io.eiren.util.collections.FastList; import java.util.List; + public class TransformNodeWrapper { public final TransformNode wrappedNode; @@ -17,7 +18,12 @@ public class TransformNodeWrapper { protected TransformNodeWrapper parent; private boolean reversedHierarchy = false; - public TransformNodeWrapper(TransformNode nodeToWrap, String name, boolean reversedHierarchy, int initialChildCapacity) { + public TransformNodeWrapper( + TransformNode nodeToWrap, + String name, + boolean reversedHierarchy, + int initialChildCapacity + ) { this.wrappedNode = nodeToWrap; this.name = name; @@ -38,7 +44,11 @@ public class TransformNodeWrapper { this(nodeToWrap, name, false, 5); } - public TransformNodeWrapper(TransformNode nodeToWrap, boolean reversedHierarchy, int initialChildCapacity) { + public TransformNodeWrapper( + TransformNode nodeToWrap, + boolean reversedHierarchy, + int initialChildCapacity + ) { this(nodeToWrap, nodeToWrap.getName(), reversedHierarchy, initialChildCapacity); } @@ -55,8 +65,13 @@ public class TransformNodeWrapper { } public static TransformNodeWrapper wrapFullHierarchyWithFakeRoot(TransformNode root) { - // Allocate a "fake" root with appropriate size depending on connections the root has - TransformNodeWrapper fakeRoot = new TransformNodeWrapper(root, root.getParent() != null ? 2 : 1); + // Allocate a "fake" root with appropriate size depending on connections + // the + // root has + TransformNodeWrapper fakeRoot = new TransformNodeWrapper( + root, + root.getParent() != null ? 2 : 1 + ); // Attach downwards hierarchy to the fake root wrapNodeHierarchyDown(root, fakeRoot); @@ -75,7 +90,10 @@ public class TransformNodeWrapper { return wrapNodeHierarchyDown(root, new TransformNodeWrapper(root, root.children.size())); } - public static TransformNodeWrapper wrapNodeHierarchyDown(TransformNode root, TransformNodeWrapper target) { + public static TransformNodeWrapper wrapNodeHierarchyDown( + TransformNode root, + TransformNodeWrapper target + ) { for (TransformNode child : root.children) { target.attachChild(wrapHierarchyDown(child)); } @@ -84,21 +102,30 @@ public class TransformNodeWrapper { } public static TransformNodeWrapper wrapHierarchyUp(TransformNode root) { - return wrapNodeHierarchyUp(new TransformNodeWrapper(root, true, root.getParent() != null ? 1 : 0)); + return wrapNodeHierarchyUp( + new TransformNodeWrapper(root, true, root.getParent() != null ? 1 : 0) + ); } public static TransformNodeWrapper wrapNodeHierarchyUp(TransformNodeWrapper root) { return wrapNodeHierarchyUp(root.wrappedNode, root); } - public static TransformNodeWrapper wrapNodeHierarchyUp(TransformNode root, TransformNodeWrapper target) { + public static TransformNodeWrapper wrapNodeHierarchyUp( + TransformNode root, + TransformNodeWrapper target + ) { TransformNode parent = root.getParent(); if (parent == null) { return target; } // Flip the offset for these reversed nodes - TransformNodeWrapper wrapper = new TransformNodeWrapper(parent, true, (parent.getParent() != null ? 1 : 0) + Math.max(0, parent.children.size() - 1)); + TransformNodeWrapper wrapper = new TransformNodeWrapper( + parent, + true, + (parent.getParent() != null ? 1 : 0) + Math.max(0, parent.children.size() - 1) + ); target.attachChild(wrapper); // Re-attach other children @@ -135,7 +162,10 @@ public class TransformNodeWrapper { return calculateLocalRotationInverse(relativeTo.inverse(), result); } - public Quaternion calculateLocalRotationInverse(Quaternion inverseRelativeTo, Quaternion result) { + public Quaternion calculateLocalRotationInverse( + Quaternion inverseRelativeTo, + Quaternion result + ) { if (result == null) { result = new Quaternion(); } diff --git a/src/main/java/dev/slimevr/protocol/ConnectionContext.java b/src/main/java/dev/slimevr/protocol/ConnectionContext.java index 121e16d39..5c89601ff 100644 --- a/src/main/java/dev/slimevr/protocol/ConnectionContext.java +++ b/src/main/java/dev/slimevr/protocol/ConnectionContext.java @@ -5,11 +5,13 @@ import solarxr_protocol.data_feed.DataFeedConfigT; import java.util.ArrayList; import java.util.List; + public class ConnectionContext { private final List dataFeedConfigList = new ArrayList<>(); - // I did it in a separate array because it was more convenient than making a parent object of the DataFeedConfigT + // I did it in a separate array because it was more convenient than making a + // parent object of the DataFeedConfigT // idk if it should be a concern or not, i think it is fine tbh // Futurabeast private final List dataFeedTimers = new ArrayList<>(); diff --git a/src/main/java/dev/slimevr/protocol/DataFeedBuilder.java b/src/main/java/dev/slimevr/protocol/DataFeedBuilder.java index e2c31f197..00529b8ae 100644 --- a/src/main/java/dev/slimevr/protocol/DataFeedBuilder.java +++ b/src/main/java/dev/slimevr/protocol/DataFeedBuilder.java @@ -5,7 +5,7 @@ import com.jme3.math.Quaternion; import com.jme3.math.Vector3f; import dev.slimevr.vr.trackers.IMUTracker; import dev.slimevr.vr.trackers.Tracker; -import dev.slimevr.vr.trackers.udp.Device; +import dev.slimevr.vr.trackers.udp.UDPDevice; import solarxr_protocol.data_feed.DataFeedUpdate; import solarxr_protocol.data_feed.device_data.DeviceData; import solarxr_protocol.data_feed.device_data.DeviceDataMaskT; @@ -23,19 +23,22 @@ import solarxr_protocol.datatypes.math.Vec3f; import java.util.ArrayList; import java.util.List; + public class DataFeedBuilder { - public static int createHardwareInfo(FlatBufferBuilder fbb, Device device) { + public static int createHardwareInfo(FlatBufferBuilder fbb, UDPDevice device) { IMUTracker tracker = device.sensors.get(0); HardwareInfo.startHardwareInfo(fbb); // BRUH MOMENT - //TODO need support: HardwareInfo.addFirmwareVersion(fbb, firmwareVersionOffset); - //TODO need support: HardwareInfo.addHardwareRevision(fbb, hardwareRevisionOffset); - //TODO need support: HardwareInfo.addManufacturer(fbb, device.m); - //TODO need support: HardwareInfo.addDisplayName(fbb, de); - //TODO need support: HardwareInfo.addHardwareAddress(fbb, tracker.); - //TODO need support: HardwareInfo.addMcuId(device); + // TODO need support: HardwareInfo.addFirmwareVersion(fbb, + // firmwareVersionOffset); + // TODO need support: HardwareInfo.addHardwareRevision(fbb, + // hardwareRevisionOffset); + // TODO need support: HardwareInfo.addManufacturer(fbb, device.m); + // TODO need support: HardwareInfo.addDisplayName(fbb, de); + // TODO need support: HardwareInfo.addHardwareAddress(fbb, tracker.); + // TODO need support: HardwareInfo.addMcuId(device); return HardwareInfo.endHardwareInfo(fbb); } @@ -51,28 +54,33 @@ public class DataFeedBuilder { public static int createTrackerInfos(FlatBufferBuilder fbb, boolean infoMask, Tracker tracker) { - if (!infoMask) return 0; + if (!infoMask) + return 0; TrackerInfo.startTrackerInfo(fbb); if (tracker.getBodyPosition() != null) TrackerInfo.addBodyPart(fbb, tracker.getBodyPosition().id); TrackerInfo.addEditable(fbb, tracker.userEditable()); TrackerInfo.addComputed(fbb, tracker.isComputed()); - //TODO need support: TrackerInfo.addImuType(fbb, tracker.im); - //TODO need support: TrackerInfo.addPollRate(fbb, tracker.); + // TODO need support: TrackerInfo.addImuType(fbb, tracker.im); + // TODO need support: TrackerInfo.addPollRate(fbb, tracker.); if (tracker instanceof IMUTracker) { IMUTracker imuTracker = (IMUTracker) tracker; if (imuTracker.getMountingRotation() != null) { Quaternion quaternion = imuTracker.getMountingRotation(); - TrackerInfo.addMountingOrientation(fbb, - Quat.createQuat(fbb, + TrackerInfo + .addMountingOrientation( + fbb, + Quat + .createQuat( + fbb, quaternion.getX(), quaternion.getY(), quaternion.getZ(), quaternion.getW() - ) - ); + ) + ); } } return TrackerInfo.endTrackerInfo(fbb); @@ -89,12 +97,14 @@ public class DataFeedBuilder { Quaternion quaternion = new Quaternion(); tracker.getRotation(quaternion); - return Quat.createQuat(fbb, + return Quat + .createQuat( + fbb, quaternion.getX(), quaternion.getY(), quaternion.getZ(), quaternion.getW() - ); + ); } public static int createTrackerTemperature(FlatBufferBuilder fbb, Tracker tracker) { @@ -104,7 +114,11 @@ public class DataFeedBuilder { return Temperature.createTemperature(fbb, imuTracker.temperature); } - public static int createTrackerData(FlatBufferBuilder fbb, TrackerDataMaskT mask, Tracker tracker) { + public static int createTrackerData( + FlatBufferBuilder fbb, + TrackerDataMaskT mask, + Tracker tracker + ) { int trackerInfosOffset = DataFeedBuilder.createTrackerInfos(fbb, mask.getInfo(), tracker); int trackerIdOffset = DataFeedBuilder.createTrackerId(fbb, tracker); @@ -129,13 +143,19 @@ public class DataFeedBuilder { return TrackerData.endTrackerData(fbb); } - public static int createTrackersData(FlatBufferBuilder fbb, DeviceDataMaskT mask, Device device) { - if (mask.getTrackerData() == null) return 0; + public static int createTrackersData( + FlatBufferBuilder fbb, + DeviceDataMaskT mask, + UDPDevice device + ) { + if (mask.getTrackerData() == null) + return 0; List trackersOffsets = new ArrayList<>(); device.sensors.forEach((key, value) -> { - trackersOffsets.add(DataFeedBuilder.createTrackerData(fbb, mask.getTrackerData(), value)); + trackersOffsets + .add(DataFeedBuilder.createTrackerData(fbb, mask.getTrackerData(), value)); }); DeviceData.startTrackersVector(fbb, trackersOffsets.size()); @@ -145,14 +165,22 @@ public class DataFeedBuilder { return fbb.endVector(); } - public static int createDeviceData(FlatBufferBuilder fbb, int id, DeviceDataMaskT mask, Device device) { - if (!mask.getDeviceData()) return 0; + public static int createDeviceData( + FlatBufferBuilder fbb, + int id, + DeviceDataMaskT mask, + UDPDevice device + ) { + if (!mask.getDeviceData()) + return 0; IMUTracker tracker = device.sensors.get(0); - if (tracker == null) return 0; + if (tracker == null) + return 0; - int hardwareDataOffset = HardwareStatus.createHardwareStatus( + int hardwareDataOffset = HardwareStatus + .createHardwareStatus( fbb, tracker.getStatus().id, (int) tracker.getTPS(), @@ -162,12 +190,12 @@ public class DataFeedBuilder { tracker.getBatteryVoltage(), (int) tracker.getBatteryLevel(), -1 - ); + ); int hardwareInfoOffset = DataFeedBuilder.createHardwareInfo(fbb, device); int trackersOffset = DataFeedBuilder.createTrackersData(fbb, mask, device); DeviceData.startDeviceData(fbb); - //TODO need support: DeviceData.addCustomName(fbb, nameOffset); + // TODO need support: DeviceData.addCustomName(fbb, nameOffset); DeviceData.addId(fbb, DeviceId.createDeviceId(fbb, id)); DeviceData.addHardwareStatus(fbb, hardwareDataOffset); DeviceData.addHardwareInfo(fbb, hardwareInfoOffset); @@ -176,8 +204,13 @@ public class DataFeedBuilder { return DeviceData.endDeviceData(fbb); } - public static int createSyntheticTrackersData(FlatBufferBuilder fbb, TrackerDataMaskT trackerDataMaskT, List trackers) { - if (trackerDataMaskT == null) return 0; + public static int createSyntheticTrackersData( + FlatBufferBuilder fbb, + TrackerDataMaskT trackerDataMaskT, + List trackers + ) { + if (trackerDataMaskT == null) + return 0; List trackerOffsets = new ArrayList<>(); @@ -192,13 +225,19 @@ public class DataFeedBuilder { return fbb.endVector(); } - public static int createDevicesData(FlatBufferBuilder fbb, DeviceDataMaskT deviceDataMaskT, List devices) { - if (deviceDataMaskT == null) return 0; + public static int createDevicesData( + FlatBufferBuilder fbb, + DeviceDataMaskT deviceDataMaskT, + List devices + ) { + if (deviceDataMaskT == null) + return 0; int[] devicesDataOffsets = new int[devices.size()]; for (int i = 0; i < devices.size(); i++) { - Device device = devices.get(i); - devicesDataOffsets[i] = DataFeedBuilder.createDeviceData(fbb, i, deviceDataMaskT, device); + UDPDevice device = devices.get(i); + devicesDataOffsets[i] = DataFeedBuilder + .createDeviceData(fbb, i, deviceDataMaskT, device); } return DataFeedUpdate.createDevicesVector(fbb, devicesDataOffsets); diff --git a/src/main/java/dev/slimevr/protocol/DataFeedHandler.java b/src/main/java/dev/slimevr/protocol/DataFeedHandler.java index 58476be56..abec879e7 100644 --- a/src/main/java/dev/slimevr/protocol/DataFeedHandler.java +++ b/src/main/java/dev/slimevr/protocol/DataFeedHandler.java @@ -7,6 +7,7 @@ import solarxr_protocol.data_feed.*; import java.util.function.BiConsumer; + public class DataFeedHandler extends ProtocolHandler { private final ProtocolAPI api; @@ -22,22 +23,29 @@ public class DataFeedHandler extends ProtocolHandler { private void onStartDataFeed(GenericConnection conn, DataFeedMessageHeader header) { StartDataFeed req = (StartDataFeed) header.message(new StartDataFeed()); - if (req == null) return; + if (req == null) + return; int dataFeeds = req.dataFeedsLength(); conn.getContext().getDataFeedConfigList().clear(); for (int i = 0; i < dataFeeds; i++) { - // Using the object api here because we need to copy from the buffer anyway so let's do it from here and send the reference to an arraylist + // Using the object api here because we need to copy from the buffer + // anyway so + // let's do it from here and send the reference to an arraylist DataFeedConfigT config = req.dataFeeds(i).unpack(); conn.getContext().getDataFeedConfigList().add(config); conn.getContext().getDataFeedTimers().add(System.currentTimeMillis()); } } - private void onPollDataFeedRequest(GenericConnection conn, DataFeedMessageHeader messageHeader) { + private void onPollDataFeedRequest( + GenericConnection conn, + DataFeedMessageHeader messageHeader + ) { PollDataFeed req = (PollDataFeed) messageHeader.message(new PollDataFeed()); - if (req == null) return; + if (req == null) + return; FlatBufferBuilder fbb = new FlatBufferBuilder(300); @@ -58,8 +66,18 @@ public class DataFeedHandler extends ProtocolHandler { } public int buildDatafeed(FlatBufferBuilder fbb, DataFeedConfigT config) { - int devicesOffset = DataFeedBuilder.createDevicesData(fbb, config.getDataMask(), this.api.server.getTrackersServer().getConnections()); - int trackersOffset = DataFeedBuilder.createSyntheticTrackersData(fbb, config.getSyntheticTrackersMask(), this.api.server.getAllTrackers()); + int devicesOffset = DataFeedBuilder + .createDevicesData( + fbb, + config.getDataMask(), + this.api.server.getTrackersServer().getConnections() + ); + int trackersOffset = DataFeedBuilder + .createSyntheticTrackersData( + fbb, + config.getSyntheticTrackersMask(), + this.api.server.getAllTrackers() + ); return DataFeedUpdate.createDataFeedUpdate(fbb, devicesOffset, trackersOffset); } @@ -107,11 +125,15 @@ public class DataFeedHandler extends ProtocolHandler { @Override public void onMessage(GenericConnection conn, DataFeedMessageHeader message) { - BiConsumer consumer = this.handlers[message.messageType()]; + BiConsumer consumer = this.handlers[message + .messageType()]; if (consumer != null) consumer.accept(conn, message); else - LogManager.log.info("[ProtocolAPI] Unhandled Datafeed packet received id: " + message.messageType()); + LogManager + .info( + "[ProtocolAPI] Unhandled Datafeed packet received id: " + message.messageType() + ); } @Override diff --git a/src/main/java/dev/slimevr/protocol/GenericConnection.java b/src/main/java/dev/slimevr/protocol/GenericConnection.java index e5ea61196..b11e8f463 100644 --- a/src/main/java/dev/slimevr/protocol/GenericConnection.java +++ b/src/main/java/dev/slimevr/protocol/GenericConnection.java @@ -3,6 +3,7 @@ package dev.slimevr.protocol; import java.nio.ByteBuffer; import java.util.UUID; + public interface GenericConnection { UUID getConnectionId(); diff --git a/src/main/java/dev/slimevr/protocol/ProtocolAPI.java b/src/main/java/dev/slimevr/protocol/ProtocolAPI.java index 951def32d..37877388e 100644 --- a/src/main/java/dev/slimevr/protocol/ProtocolAPI.java +++ b/src/main/java/dev/slimevr/protocol/ProtocolAPI.java @@ -9,6 +9,7 @@ import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; + public class ProtocolAPI { public final VRServer server; diff --git a/src/main/java/dev/slimevr/protocol/ProtocolAPIServer.java b/src/main/java/dev/slimevr/protocol/ProtocolAPIServer.java index b14136f73..71235a5b6 100644 --- a/src/main/java/dev/slimevr/protocol/ProtocolAPIServer.java +++ b/src/main/java/dev/slimevr/protocol/ProtocolAPIServer.java @@ -2,6 +2,7 @@ package dev.slimevr.protocol; import java.util.stream.Stream; + public interface ProtocolAPIServer { Stream getAPIConnections(); diff --git a/src/main/java/dev/slimevr/protocol/ProtocolHandler.java b/src/main/java/dev/slimevr/protocol/ProtocolHandler.java index 8829b87c5..2b46cb502 100644 --- a/src/main/java/dev/slimevr/protocol/ProtocolHandler.java +++ b/src/main/java/dev/slimevr/protocol/ProtocolHandler.java @@ -5,6 +5,7 @@ import solarxr_protocol.MessageBundle; import java.util.function.BiConsumer; + public abstract class ProtocolHandler { public final BiConsumer[] handlers; diff --git a/src/main/java/dev/slimevr/protocol/RPCBuilder.java b/src/main/java/dev/slimevr/protocol/RPCBuilder.java index b88fb0f3c..f8f64ef84 100644 --- a/src/main/java/dev/slimevr/protocol/RPCBuilder.java +++ b/src/main/java/dev/slimevr/protocol/RPCBuilder.java @@ -6,14 +6,19 @@ import dev.slimevr.vr.processor.skeleton.SkeletonConfigValue; import solarxr_protocol.rpc.SkeletonConfigResponse; import solarxr_protocol.rpc.SkeletonPart; + public class RPCBuilder { - public static int createSkeletonConfig(FlatBufferBuilder fbb, HumanPoseProcessor humanPoseProcessor) { + public static int createSkeletonConfig( + FlatBufferBuilder fbb, + HumanPoseProcessor humanPoseProcessor + ) { int[] partsOffsets = new int[SkeletonConfigValue.values().length]; for (int index = 0; index < SkeletonConfigValue.values().length; index++) { SkeletonConfigValue val = SkeletonConfigValue.values[index]; - int part = SkeletonPart.createSkeletonPart(fbb, val.id, humanPoseProcessor.getSkeletonConfig(val)); + int part = SkeletonPart + .createSkeletonPart(fbb, val.id, humanPoseProcessor.getSkeletonConfig(val)); partsOffsets[index] = part; } diff --git a/src/main/java/dev/slimevr/protocol/RPCHandler.java b/src/main/java/dev/slimevr/protocol/RPCHandler.java index 520e3e850..9253860e9 100644 --- a/src/main/java/dev/slimevr/protocol/RPCHandler.java +++ b/src/main/java/dev/slimevr/protocol/RPCHandler.java @@ -14,6 +14,7 @@ import solarxr_protocol.rpc.*; import java.util.function.BiConsumer; + public class RPCHandler extends ProtocolHandler implements SerialListener { private final ProtocolAPI api; @@ -33,7 +34,10 @@ public class RPCHandler extends ProtocolHandler implements Ser registerPacketListener(RpcMessage.SkeletonResetAllRequest, this::onSkeletonResetAllRequest); registerPacketListener(RpcMessage.SkeletonConfigRequest, this::onSkeletonConfigRequest); - registerPacketListener(RpcMessage.ChangeSkeletonConfigRequest, this::onChangeSkeletonConfigRequest); + registerPacketListener( + RpcMessage.ChangeSkeletonConfigRequest, + this::onChangeSkeletonConfigRequest + ); registerPacketListener(RpcMessage.SetWifiRequest, this::onSetWifiRequest); registerPacketListener(RpcMessage.OpenSerialRequest, this::onOpenSerialRequest); @@ -44,16 +48,22 @@ public class RPCHandler extends ProtocolHandler implements Ser public void onSetWifiRequest(GenericConnection conn, RpcMessageHeader messageHeader) { SetWifiRequest req = (SetWifiRequest) messageHeader.message(new SetWifiRequest()); - if (req == null) return; + if (req == null) + return; - if (req.password() == null || req.ssid() == null || !this.api.server.getSerialHandler().isConnected()) + if ( + req.password() == null + || req.ssid() == null + || !this.api.server.getSerialHandler().isConnected() + ) return; this.api.server.getSerialHandler().setWifi(req.ssid(), req.password()); } public void onOpenSerialRequest(GenericConnection conn, RpcMessageHeader messageHeader) { OpenSerialRequest req = (OpenSerialRequest) messageHeader.message(new OpenSerialRequest()); - if (req == null) return; + if (req == null) + return; conn.getContext().setUseSerial(true); @@ -69,8 +79,10 @@ public class RPCHandler extends ProtocolHandler implements Ser } public void onCloseSerialRequest(GenericConnection conn, RpcMessageHeader messageHeader) { - CloseSerialRequest req = (CloseSerialRequest) messageHeader.message(new CloseSerialRequest()); - if (req == null) return; + CloseSerialRequest req = (CloseSerialRequest) messageHeader + .message(new CloseSerialRequest()); + if (req == null) + return; conn.getContext().setUseSerial(false); @@ -86,8 +98,10 @@ public class RPCHandler extends ProtocolHandler implements Ser } public void onSkeletonResetAllRequest(GenericConnection conn, RpcMessageHeader messageHeader) { - SkeletonResetAllRequest req = (SkeletonResetAllRequest) messageHeader.message(new SkeletonResetAllRequest()); - if (req == null) return; + SkeletonResetAllRequest req = (SkeletonResetAllRequest) messageHeader + .message(new SkeletonResetAllRequest()); + if (req == null) + return; this.api.server.humanPoseProcessor.getSkeletonConfig().resetConfigs(); this.api.server.saveConfig(); @@ -101,8 +115,10 @@ public class RPCHandler extends ProtocolHandler implements Ser } public void onSkeletonConfigRequest(GenericConnection conn, RpcMessageHeader messageHeader) { - SkeletonConfigRequest req = (SkeletonConfigRequest) messageHeader.message(new SkeletonConfigRequest()); - if (req == null) return; + SkeletonConfigRequest req = (SkeletonConfigRequest) messageHeader + .message(new SkeletonConfigRequest()); + if (req == null) + return; FlatBufferBuilder fbb = new FlatBufferBuilder(300); int config = RPCBuilder.createSkeletonConfig(fbb, this.api.server.humanPoseProcessor); @@ -111,9 +127,14 @@ public class RPCHandler extends ProtocolHandler implements Ser conn.send(fbb.dataBuffer()); } - public void onChangeSkeletonConfigRequest(GenericConnection conn, RpcMessageHeader messageHeader) { - ChangeSkeletonConfigRequest req = (ChangeSkeletonConfigRequest) messageHeader.message(new ChangeSkeletonConfigRequest()); - if (req == null) return; + public void onChangeSkeletonConfigRequest( + GenericConnection conn, + RpcMessageHeader messageHeader + ) { + ChangeSkeletonConfigRequest req = (ChangeSkeletonConfigRequest) messageHeader + .message(new ChangeSkeletonConfigRequest()); + if (req == null) + return; SkeletonConfigValue joint = SkeletonConfigValue.getById(req.bone()); @@ -124,7 +145,8 @@ public class RPCHandler extends ProtocolHandler implements Ser public void onRecordBVHRequest(GenericConnection conn, RpcMessageHeader messageHeader) { RecordBVHRequest req = (RecordBVHRequest) messageHeader.message(new RecordBVHRequest()); - if (req == null) return; + if (req == null) + return; if (req.stop()) { if (this.api.server.getBvhRecorder().isRecording()) @@ -135,7 +157,8 @@ public class RPCHandler extends ProtocolHandler implements Ser } FlatBufferBuilder fbb = new FlatBufferBuilder(40); - int status = RecordBVHStatus.createRecordBVHStatus(fbb, this.api.server.getBvhRecorder().isRecording()); + int status = RecordBVHStatus + .createRecordBVHStatus(fbb, this.api.server.getBvhRecorder().isRecording()); int outbound = this.createRPCMessage(fbb, RpcMessage.RecordBVHStatus, status); fbb.finish(outbound); conn.send(fbb.dataBuffer()); @@ -143,18 +166,21 @@ public class RPCHandler extends ProtocolHandler implements Ser public void onResetRequest(GenericConnection conn, RpcMessageHeader messageHeader) { ResetRequest req = (ResetRequest) messageHeader.message(new ResetRequest()); - if (req == null) return; + if (req == null) + return; if (req.resetType() == ResetType.Quick) this.api.server.resetTrackersYaw(); if (req.resetType() == ResetType.Full) this.api.server.resetTrackers(); - LogManager.log.severe("[WebSocketAPI] Reset performed"); + LogManager.severe("[WebSocketAPI] Reset performed"); } public void onAssignTrackerRequest(GenericConnection conn, RpcMessageHeader messageHeader) { - AssignTrackerRequest req = (AssignTrackerRequest) messageHeader.message(new AssignTrackerRequest()); - if (req == null) return; + AssignTrackerRequest req = (AssignTrackerRequest) messageHeader + .message(new AssignTrackerRequest()); + if (req == null) + return; Tracker tracker = this.api.server.getTrackerById(req.trackerId().unpack()); if (tracker == null) @@ -166,12 +192,15 @@ public class RPCHandler extends ProtocolHandler implements Ser ReferenceAdjustedTracker refTracker = (ReferenceAdjustedTracker) tracker; if (refTracker.getTracker() instanceof IMUTracker) { IMUTracker imu = (IMUTracker) refTracker.getTracker(); - imu.setMountingRotation(new Quaternion( - req.mountingRotation().x(), - req.mountingRotation().y(), - req.mountingRotation().z(), - req.mountingRotation().w() - )); + imu + .setMountingRotation( + new Quaternion( + req.mountingRotation().x(), + req.mountingRotation().y(), + req.mountingRotation().z(), + req.mountingRotation().w() + ) + ); } } this.api.server.trackerUpdated(tracker); @@ -182,22 +211,29 @@ public class RPCHandler extends ProtocolHandler implements Ser WindowsNamedPipeBridge bridge = this.api.server.getVRBridge(WindowsNamedPipeBridge.class); - int steamvrTrackerSettings = SteamVRTrackersSetting.createSteamVRTrackersSetting(fbb, + int steamvrTrackerSettings = SteamVRTrackersSetting + .createSteamVRTrackersSetting( + fbb, bridge.getShareSetting(TrackerRole.WAIST), bridge.getShareSetting(TrackerRole.CHEST), - bridge.getShareSetting(TrackerRole.LEFT_FOOT) && bridge.getShareSetting(TrackerRole.RIGHT_FOOT), - bridge.getShareSetting(TrackerRole.LEFT_KNEE) && bridge.getShareSetting(TrackerRole.RIGHT_KNEE), - bridge.getShareSetting(TrackerRole.LEFT_ELBOW) && bridge.getShareSetting(TrackerRole.RIGHT_ELBOW) - ); + bridge.getShareSetting(TrackerRole.LEFT_FOOT) + && bridge.getShareSetting(TrackerRole.RIGHT_FOOT), + bridge.getShareSetting(TrackerRole.LEFT_KNEE) + && bridge.getShareSetting(TrackerRole.RIGHT_KNEE), + bridge.getShareSetting(TrackerRole.LEFT_ELBOW) + && bridge.getShareSetting(TrackerRole.RIGHT_ELBOW) + ); - int filterSettings = FilteringSettings.createFilteringSettings( + int filterSettings = FilteringSettings + .createFilteringSettings( fbb, TrackerFilters.valueOf(this.api.server.config.getString("filters.type", "NONE")).id, (int) (this.api.server.config.getFloat("filters.amount", 0.3f) * 100), this.api.server.config.getInt("filters.tickCount", 1) - ); + ); - int settings = SettingsResponse.createSettingsResponse(fbb, steamvrTrackerSettings, filterSettings); + int settings = SettingsResponse + .createSettingsResponse(fbb, steamvrTrackerSettings, filterSettings); int outbound = createRPCMessage(fbb, RpcMessage.SettingsResponse, settings); fbb.finish(outbound); conn.send(fbb.dataBuffer()); @@ -205,11 +241,14 @@ public class RPCHandler extends ProtocolHandler implements Ser public void onChangeSettingsRequest(GenericConnection conn, RpcMessageHeader messageHeader) { - ChangeSettingsRequest req = (ChangeSettingsRequest) messageHeader.message(new ChangeSettingsRequest()); - if (req == null) return; + ChangeSettingsRequest req = (ChangeSettingsRequest) messageHeader + .message(new ChangeSettingsRequest()); + if (req == null) + return; if (req.steamVrTrackers() != null) { - WindowsNamedPipeBridge bridge = this.api.server.getVRBridge(WindowsNamedPipeBridge.class); + WindowsNamedPipeBridge bridge = this.api.server + .getVRBridge(WindowsNamedPipeBridge.class); bridge.changeShareSettings(TrackerRole.WAIST, req.steamVrTrackers().waist()); bridge.changeShareSettings(TrackerRole.CHEST, req.steamVrTrackers().chest()); bridge.changeShareSettings(TrackerRole.LEFT_FOOT, req.steamVrTrackers().legs()); @@ -223,18 +262,25 @@ public class RPCHandler extends ProtocolHandler implements Ser if (req.filtering() != null) { TrackerFilters type = TrackerFilters.fromId(req.filtering().type()); if (type != null) { - this.api.server.updateTrackersFilters(type, (float) req.filtering().intensity() / 100.0f, req.filtering().ticks()); + this.api.server + .updateTrackersFilters( + type, + (float) req.filtering().intensity() / 100.0f, + req.filtering().ticks() + ); } } } @Override public void onMessage(GenericConnection conn, RpcMessageHeader message) { - BiConsumer consumer = this.handlers[message.messageType()]; + BiConsumer consumer = this.handlers[message + .messageType()]; if (consumer != null) consumer.accept(conn, message); else - LogManager.log.info("[ProtocolAPI] Unhandled RPC packet received id: " + message.messageType()); + LogManager + .info("[ProtocolAPI] Unhandled RPC packet received id: " + message.messageType()); } public int createRPCMessage(FlatBufferBuilder fbb, byte messageType, int messageOffset) { @@ -259,59 +305,65 @@ public class RPCHandler extends ProtocolHandler implements Ser public void onSerialConnected(SerialPort port) { this.api.getAPIServers().forEach((server) -> { - server.getAPIConnections() - .filter(conn -> conn.getContext().useSerial()) - .forEach((conn) -> { - FlatBufferBuilder fbb = new FlatBufferBuilder(32); + server + .getAPIConnections() + .filter(conn -> conn.getContext().useSerial()) + .forEach((conn) -> { + FlatBufferBuilder fbb = new FlatBufferBuilder(32); - SerialUpdateResponse.startSerialUpdateResponse(fbb); - SerialUpdateResponse.addClosed(fbb, false); - int update = SerialUpdateResponse.endSerialUpdateResponse(fbb); - int outbound = this.createRPCMessage(fbb, RpcMessage.SerialUpdateResponse, update); - fbb.finish(outbound); + SerialUpdateResponse.startSerialUpdateResponse(fbb); + SerialUpdateResponse.addClosed(fbb, false); + int update = SerialUpdateResponse.endSerialUpdateResponse(fbb); + int outbound = this + .createRPCMessage(fbb, RpcMessage.SerialUpdateResponse, update); + fbb.finish(outbound); - conn.send(fbb.dataBuffer()); - }); + conn.send(fbb.dataBuffer()); + }); }); } @Override public void onSerialDisconnected() { this.api.getAPIServers().forEach((server) -> { - server.getAPIConnections() - .filter(conn -> conn.getContext().useSerial()) - .forEach((conn) -> { - FlatBufferBuilder fbb = new FlatBufferBuilder(32); + server + .getAPIConnections() + .filter(conn -> conn.getContext().useSerial()) + .forEach((conn) -> { + FlatBufferBuilder fbb = new FlatBufferBuilder(32); - SerialUpdateResponse.startSerialUpdateResponse(fbb); - SerialUpdateResponse.addClosed(fbb, true); - int update = SerialUpdateResponse.endSerialUpdateResponse(fbb); - int outbound = this.createRPCMessage(fbb, RpcMessage.SerialUpdateResponse, update); - fbb.finish(outbound); - conn.send(fbb.dataBuffer()); - conn.getContext().setUseSerial(false); - }); + SerialUpdateResponse.startSerialUpdateResponse(fbb); + SerialUpdateResponse.addClosed(fbb, true); + int update = SerialUpdateResponse.endSerialUpdateResponse(fbb); + int outbound = this + .createRPCMessage(fbb, RpcMessage.SerialUpdateResponse, update); + fbb.finish(outbound); + conn.send(fbb.dataBuffer()); + conn.getContext().setUseSerial(false); + }); }); } @Override public void onSerialLog(String str) { this.api.getAPIServers().forEach((server) -> { - server.getAPIConnections() - .filter(conn -> conn.getContext().useSerial()) - .forEach((conn) -> { - FlatBufferBuilder fbb = new FlatBufferBuilder(32); + server + .getAPIConnections() + .filter(conn -> conn.getContext().useSerial()) + .forEach((conn) -> { + FlatBufferBuilder fbb = new FlatBufferBuilder(32); - int logOffset = fbb.createString(str); + int logOffset = fbb.createString(str); - SerialUpdateResponse.startSerialUpdateResponse(fbb); - SerialUpdateResponse.addLog(fbb, logOffset); - int update = SerialUpdateResponse.endSerialUpdateResponse(fbb); - int outbound = this.createRPCMessage(fbb, RpcMessage.SerialUpdateResponse, update); - fbb.finish(outbound); + SerialUpdateResponse.startSerialUpdateResponse(fbb); + SerialUpdateResponse.addLog(fbb, logOffset); + int update = SerialUpdateResponse.endSerialUpdateResponse(fbb); + int outbound = this + .createRPCMessage(fbb, RpcMessage.SerialUpdateResponse, update); + fbb.finish(outbound); - conn.send(fbb.dataBuffer()); - }); + conn.send(fbb.dataBuffer()); + }); }); } } diff --git a/src/main/java/dev/slimevr/serial/SerialHandler.java b/src/main/java/dev/slimevr/serial/SerialHandler.java index 2418b8ea0..24e916b10 100644 --- a/src/main/java/dev/slimevr/serial/SerialHandler.java +++ b/src/main/java/dev/slimevr/serial/SerialHandler.java @@ -12,6 +12,7 @@ import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; + public class SerialHandler implements SerialPortMessageListener { private final List listeners = new ArrayList<>(); @@ -32,7 +33,11 @@ public class SerialHandler implements SerialPortMessageListener { SerialPort[] ports = SerialPort.getCommPorts(); for (SerialPort port : ports) { - if (port.getDescriptivePortName().toLowerCase().contains("ch340") || port.getDescriptivePortName().toLowerCase().contains("cp21") || port.getDescriptivePortName().toLowerCase().contains("ch910")) { + if ( + port.getDescriptivePortName().toLowerCase().contains("ch340") + || port.getDescriptivePortName().toLowerCase().contains("cp21") + || port.getDescriptivePortName().toLowerCase().contains("ch910") + ) { trackerPort = port; break; } @@ -79,7 +84,8 @@ public class SerialHandler implements SerialPortMessageListener { @Override public int getListeningEvents() { - return SerialPort.LISTENING_EVENT_PORT_DISCONNECTED | SerialPort.LISTENING_EVENT_DATA_RECEIVED; + return SerialPort.LISTENING_EVENT_PORT_DISCONNECTED + | SerialPort.LISTENING_EVENT_DATA_RECEIVED; } @Override @@ -99,7 +105,7 @@ public class SerialHandler implements SerialPortMessageListener { @Override public byte[] getMessageDelimiter() { - return new byte[]{(byte) 0x0A}; + return new byte[] { (byte) 0x0A }; } @Override @@ -107,4 +113,3 @@ public class SerialHandler implements SerialPortMessageListener { return true; } } - diff --git a/src/main/java/dev/slimevr/serial/SerialListener.java b/src/main/java/dev/slimevr/serial/SerialListener.java index 856614a25..e9059a609 100644 --- a/src/main/java/dev/slimevr/serial/SerialListener.java +++ b/src/main/java/dev/slimevr/serial/SerialListener.java @@ -2,6 +2,7 @@ package dev.slimevr.serial; import com.fazecast.jSerialComm.SerialPort; + public interface SerialListener { void onSerialConnected(SerialPort port); diff --git a/src/main/java/dev/slimevr/util/ann/VRServerThread.java b/src/main/java/dev/slimevr/util/ann/VRServerThread.java index 6d5721cbc..37d6d7180 100644 --- a/src/main/java/dev/slimevr/util/ann/VRServerThread.java +++ b/src/main/java/dev/slimevr/util/ann/VRServerThread.java @@ -3,6 +3,7 @@ package dev.slimevr.util.ann; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; + @Retention(value = RetentionPolicy.SOURCE) public @interface VRServerThread { diff --git a/src/main/java/dev/slimevr/vr/processor/ComputedHumanPoseTracker.java b/src/main/java/dev/slimevr/vr/processor/ComputedHumanPoseTracker.java index 82ec13526..462638772 100644 --- a/src/main/java/dev/slimevr/vr/processor/ComputedHumanPoseTracker.java +++ b/src/main/java/dev/slimevr/vr/processor/ComputedHumanPoseTracker.java @@ -4,17 +4,23 @@ import dev.slimevr.vr.trackers.ComputedTracker; import dev.slimevr.vr.trackers.ShareableTracker; import dev.slimevr.vr.trackers.TrackerRole; import dev.slimevr.vr.trackers.TrackerWithTPS; -import dev.slimevr.vr.trackers.udp.Device; +import dev.slimevr.vr.trackers.udp.UDPDevice; import dev.slimevr.vr.trackers.TrackerPosition; import io.eiren.util.BufferedTimer; -public class ComputedHumanPoseTracker extends ComputedTracker implements TrackerWithTPS, ShareableTracker { + +public class ComputedHumanPoseTracker extends ComputedTracker + implements TrackerWithTPS, ShareableTracker { public final ComputedHumanPoseTrackerPosition skeletonPosition; protected final TrackerRole trackerRole; protected BufferedTimer timer = new BufferedTimer(1f); - public ComputedHumanPoseTracker(int trackerId, ComputedHumanPoseTrackerPosition skeletonPosition, TrackerRole role) { + public ComputedHumanPoseTracker( + int trackerId, + ComputedHumanPoseTrackerPosition skeletonPosition, + TrackerRole role + ) { super(trackerId, "human://" + skeletonPosition.name(), true, true); this.skeletonPosition = skeletonPosition; this.trackerRole = role; @@ -37,7 +43,7 @@ public class ComputedHumanPoseTracker extends ComputedTracker implements Tracker } @Override - public Device getDevice() { + public UDPDevice getDevice() { return null; } } diff --git a/src/main/java/dev/slimevr/vr/processor/HumanPoseProcessor.java b/src/main/java/dev/slimevr/vr/processor/HumanPoseProcessor.java index 1f7e2e892..59bc0e668 100644 --- a/src/main/java/dev/slimevr/vr/processor/HumanPoseProcessor.java +++ b/src/main/java/dev/slimevr/vr/processor/HumanPoseProcessor.java @@ -13,6 +13,7 @@ import io.eiren.util.collections.FastList; import java.util.List; import java.util.function.Consumer; + public class HumanPoseProcessor { private final VRServer server; @@ -22,16 +23,86 @@ public class HumanPoseProcessor { public HumanPoseProcessor(VRServer server, HMDTracker hmd) { this.server = server; - computedTrackers.add(new ComputedHumanPoseTracker(Tracker.getNextLocalTrackerId(), ComputedHumanPoseTrackerPosition.WAIST, TrackerRole.WAIST)); - computedTrackers.add(new ComputedHumanPoseTracker(Tracker.getNextLocalTrackerId(), ComputedHumanPoseTrackerPosition.LEFT_FOOT, TrackerRole.LEFT_FOOT)); - computedTrackers.add(new ComputedHumanPoseTracker(Tracker.getNextLocalTrackerId(), ComputedHumanPoseTrackerPosition.RIGHT_FOOT, TrackerRole.RIGHT_FOOT)); - computedTrackers.add(new ComputedHumanPoseTracker(Tracker.getNextLocalTrackerId(), ComputedHumanPoseTrackerPosition.CHEST, TrackerRole.CHEST)); - computedTrackers.add(new ComputedHumanPoseTracker(Tracker.getNextLocalTrackerId(), ComputedHumanPoseTrackerPosition.LEFT_KNEE, TrackerRole.LEFT_KNEE)); - computedTrackers.add(new ComputedHumanPoseTracker(Tracker.getNextLocalTrackerId(), ComputedHumanPoseTrackerPosition.RIGHT_KNEE, TrackerRole.RIGHT_KNEE)); - computedTrackers.add(new ComputedHumanPoseTracker(Tracker.getNextLocalTrackerId(), ComputedHumanPoseTrackerPosition.LEFT_ELBOW, TrackerRole.LEFT_ELBOW)); - computedTrackers.add(new ComputedHumanPoseTracker(Tracker.getNextLocalTrackerId(), ComputedHumanPoseTrackerPosition.RIGHT_ELBOW, TrackerRole.RIGHT_ELBOW)); - computedTrackers.add(new ComputedHumanPoseTracker(Tracker.getNextLocalTrackerId(), ComputedHumanPoseTrackerPosition.LEFT_HAND, TrackerRole.LEFT_HAND)); - computedTrackers.add(new ComputedHumanPoseTracker(Tracker.getNextLocalTrackerId(), ComputedHumanPoseTrackerPosition.RIGHT_HAND, TrackerRole.RIGHT_HAND)); + computedTrackers + .add( + new ComputedHumanPoseTracker( + Tracker.getNextLocalTrackerId(), + ComputedHumanPoseTrackerPosition.WAIST, + TrackerRole.WAIST + ) + ); + computedTrackers + .add( + new ComputedHumanPoseTracker( + Tracker.getNextLocalTrackerId(), + ComputedHumanPoseTrackerPosition.LEFT_FOOT, + TrackerRole.LEFT_FOOT + ) + ); + computedTrackers + .add( + new ComputedHumanPoseTracker( + Tracker.getNextLocalTrackerId(), + ComputedHumanPoseTrackerPosition.RIGHT_FOOT, + TrackerRole.RIGHT_FOOT + ) + ); + computedTrackers + .add( + new ComputedHumanPoseTracker( + Tracker.getNextLocalTrackerId(), + ComputedHumanPoseTrackerPosition.CHEST, + TrackerRole.CHEST + ) + ); + computedTrackers + .add( + new ComputedHumanPoseTracker( + Tracker.getNextLocalTrackerId(), + ComputedHumanPoseTrackerPosition.LEFT_KNEE, + TrackerRole.LEFT_KNEE + ) + ); + computedTrackers + .add( + new ComputedHumanPoseTracker( + Tracker.getNextLocalTrackerId(), + ComputedHumanPoseTrackerPosition.RIGHT_KNEE, + TrackerRole.RIGHT_KNEE + ) + ); + computedTrackers + .add( + new ComputedHumanPoseTracker( + Tracker.getNextLocalTrackerId(), + ComputedHumanPoseTrackerPosition.LEFT_ELBOW, + TrackerRole.LEFT_ELBOW + ) + ); + computedTrackers + .add( + new ComputedHumanPoseTracker( + Tracker.getNextLocalTrackerId(), + ComputedHumanPoseTrackerPosition.RIGHT_ELBOW, + TrackerRole.RIGHT_ELBOW + ) + ); + computedTrackers + .add( + new ComputedHumanPoseTracker( + Tracker.getNextLocalTrackerId(), + ComputedHumanPoseTrackerPosition.LEFT_HAND, + TrackerRole.LEFT_HAND + ) + ); + computedTrackers + .add( + new ComputedHumanPoseTracker( + Tracker.getNextLocalTrackerId(), + ComputedHumanPoseTrackerPosition.RIGHT_HAND, + TrackerRole.RIGHT_HAND + ) + ); } public HumanSkeleton getSkeleton() { diff --git a/src/main/java/dev/slimevr/vr/processor/TransformNode.java b/src/main/java/dev/slimevr/vr/processor/TransformNode.java index c31347578..b3f445a5b 100644 --- a/src/main/java/dev/slimevr/vr/processor/TransformNode.java +++ b/src/main/java/dev/slimevr/vr/processor/TransformNode.java @@ -6,6 +6,7 @@ import io.eiren.util.collections.FastList; import java.util.List; import java.util.function.Consumer; + public class TransformNode { public final Transform localTransform = new Transform(); @@ -38,7 +39,8 @@ public class TransformNode { } public void update() { - updateWorldTransforms(); // Call update on each frame because we have relatively few nodes + updateWorldTransforms(); // Call update on each frame because we have + // relatively few nodes for (TransformNode node : children) { node.update(); } @@ -71,6 +73,9 @@ public class TransformNode { worldTransform.getScale().multLocal(parent.getScale()); worldTransform.getTranslation().multLocal(parent.getScale()); - parent.getRotation().multLocal(worldTransform.getTranslation()).addLocal(parent.getTranslation()); + parent + .getRotation() + .multLocal(worldTransform.getTranslation()) + .addLocal(parent.getTranslation()); } } diff --git a/src/main/java/dev/slimevr/vr/processor/skeleton/HumanSkeleton.java b/src/main/java/dev/slimevr/vr/processor/skeleton/HumanSkeleton.java index 9cde3a6d5..451f616f7 100644 --- a/src/main/java/dev/slimevr/vr/processor/skeleton/HumanSkeleton.java +++ b/src/main/java/dev/slimevr/vr/processor/skeleton/HumanSkeleton.java @@ -4,6 +4,7 @@ import dev.slimevr.util.ann.VRServerThread; import dev.slimevr.vr.processor.TransformNode; import io.eiren.util.ann.ThreadSafe; + public abstract class HumanSkeleton { @VRServerThread diff --git a/src/main/java/dev/slimevr/vr/processor/skeleton/SimpleSkeleton.java b/src/main/java/dev/slimevr/vr/processor/skeleton/SimpleSkeleton.java index dcb01c9d9..16a2d4eab 100644 --- a/src/main/java/dev/slimevr/vr/processor/skeleton/SimpleSkeleton.java +++ b/src/main/java/dev/slimevr/vr/processor/skeleton/SimpleSkeleton.java @@ -14,10 +14,11 @@ import io.eiren.util.collections.FastList; import java.util.List; import java.util.Map; + public class SimpleSkeleton extends HumanSkeleton implements SkeletonConfigCallback { public final SkeletonConfig skeletonConfig; - //#region Upper body nodes (torso) + // #region Upper body nodes (torso) protected final TransformNode hmdNode = new TransformNode("HMD", false); protected final TransformNode headNode = new TransformNode("Head", false); protected final TransformNode neckNode = new TransformNode("Neck", false); @@ -25,56 +26,110 @@ public class SimpleSkeleton extends HumanSkeleton implements SkeletonConfigCallb protected final TransformNode trackerChestNode = new TransformNode("Chest-Tracker", false); protected final TransformNode waistNode = new TransformNode("Waist", false); protected final TransformNode hipNode = new TransformNode("Hip", false); - //#endregion + // #endregion protected final TransformNode trackerWaistNode = new TransformNode("Waist-Tracker", false); - //#region Lower body nodes (legs) + // #region Lower body nodes (legs) protected final TransformNode leftHipNode = new TransformNode("Left-Hip", false); protected final TransformNode leftKneeNode = new TransformNode("Left-Knee", false); - protected final TransformNode trackerLeftKneeNode = new TransformNode("Left-Knee-Tracker", false); + protected final TransformNode trackerLeftKneeNode = new TransformNode( + "Left-Knee-Tracker", + false + ); protected final TransformNode leftAnkleNode = new TransformNode("Left-Ankle", false); protected final TransformNode leftFootNode = new TransformNode("Left-Foot", false); - protected final TransformNode trackerLeftFootNode = new TransformNode("Left-Foot-Tracker", false); + protected final TransformNode trackerLeftFootNode = new TransformNode( + "Left-Foot-Tracker", + false + ); protected final TransformNode rightHipNode = new TransformNode("Right-Hip", false); protected final TransformNode rightKneeNode = new TransformNode("Right-Knee", false); - protected final TransformNode trackerRightKneeNode = new TransformNode("Right-Knee-Tracker", false); + protected final TransformNode trackerRightKneeNode = new TransformNode( + "Right-Knee-Tracker", + false + ); protected final TransformNode rightAnkleNode = new TransformNode("Right-Ankle", false); protected final TransformNode rightFootNode = new TransformNode("Right-Foot", false); - protected final TransformNode trackerRightFootNode = new TransformNode("Right-Foot-Tracker", false); - //#region Arms (from controllers) - protected final TransformNode leftControllerNodeContrl = new TransformNode("Left-Controller-Contrl", false); - protected final TransformNode rightControllerNodeContrl = new TransformNode("Right-Controller-Contrl", false); - //#endregion - protected final TransformNode leftWristNodeContrl = new TransformNode("Left-Wrist-Contrl", false); - protected final TransformNode rightWristNodeContrl = new TransformNode("Right-Wrist-Contrl", false); - protected final TransformNode leftElbowNodeContrl = new TransformNode("Left-Elbow-Contrl", false); - protected final TransformNode rightElbowNodeContrl = new TransformNode("Right-Elbow-Contrl", false); - protected final TransformNode trackerLeftElbowNodeContrl = new TransformNode("Left-Elbow-Tracker-Contrl", false); - protected final TransformNode trackerRightElbowNodeContrl = new TransformNode("Right-Elbow-Tracker-Contrl", false); - //#region Arms (from HMD) - protected final TransformNode leftShoulderNodeHmd = new TransformNode("Left-Shoulder-Hmd", false); - protected final TransformNode rightShoulderNodeHmd = new TransformNode("Right-Shoulder-Hmd", false); - //#endregion + protected final TransformNode trackerRightFootNode = new TransformNode( + "Right-Foot-Tracker", + false + ); + // #region Arms (from controllers) + protected final TransformNode leftControllerNodeContrl = new TransformNode( + "Left-Controller-Contrl", + false + ); + protected final TransformNode rightControllerNodeContrl = new TransformNode( + "Right-Controller-Contrl", + false + ); + // #endregion + protected final TransformNode leftWristNodeContrl = new TransformNode( + "Left-Wrist-Contrl", + false + ); + protected final TransformNode rightWristNodeContrl = new TransformNode( + "Right-Wrist-Contrl", + false + ); + protected final TransformNode leftElbowNodeContrl = new TransformNode( + "Left-Elbow-Contrl", + false + ); + protected final TransformNode rightElbowNodeContrl = new TransformNode( + "Right-Elbow-Contrl", + false + ); + protected final TransformNode trackerLeftElbowNodeContrl = new TransformNode( + "Left-Elbow-Tracker-Contrl", + false + ); + protected final TransformNode trackerRightElbowNodeContrl = new TransformNode( + "Right-Elbow-Tracker-Contrl", + false + ); + // #region Arms (from HMD) + protected final TransformNode leftShoulderNodeHmd = new TransformNode( + "Left-Shoulder-Hmd", + false + ); + protected final TransformNode rightShoulderNodeHmd = new TransformNode( + "Right-Shoulder-Hmd", + false + ); + // #endregion protected final TransformNode leftElbowNodeHmd = new TransformNode("Left-Elbow-Hmd", false); protected final TransformNode rightElbowNodeHmd = new TransformNode("Right-Elbow-Hmd", false); - protected final TransformNode trackerLeftElbowNodeHmd = new TransformNode("Left-Elbow-Tracker-Hmd", false); - protected final TransformNode trackerRightElbowNodeHmd = new TransformNode("Right-Elbow-Tracker-Hmd", false); + protected final TransformNode trackerLeftElbowNodeHmd = new TransformNode( + "Left-Elbow-Tracker-Hmd", + false + ); + protected final TransformNode trackerRightElbowNodeHmd = new TransformNode( + "Right-Elbow-Tracker-Hmd", + false + ); protected final TransformNode leftWristNodeHmd = new TransformNode("Left-Wrist-Hmd", false); protected final TransformNode rightWristNodeHmd = new TransformNode("Right-Wrist-Hmd", false); protected final TransformNode leftHandNodeHmd = new TransformNode("Left-Hand-Hmd", false); protected final TransformNode rightHandNodeHmd = new TransformNode("Right-Hand-Hmd", false); - protected final TransformNode trackerLeftHandNodeHmd = new TransformNode("Left-Hand-Tracker-Hmd", false); - protected final TransformNode trackerRightHandNodeHmd = new TransformNode("Right-Hand-Tracker-Hmd", false); + protected final TransformNode trackerLeftHandNodeHmd = new TransformNode( + "Left-Hand-Tracker-Hmd", + false + ); + protected final TransformNode trackerRightHandNodeHmd = new TransformNode( + "Right-Hand-Tracker-Hmd", + false + ); protected final Vector3f hipVector = new Vector3f(); protected final Vector3f ankleVector = new Vector3f(); - //#endregion + // #endregion protected final Quaternion kneeRotation = new Quaternion(); - //#region Buffers + // #region Buffers private final Vector3f posBuf = new Vector3f(); private final Quaternion rotBuf2 = new Quaternion(); protected float minKneePitch = 0f * FastMath.DEG_TO_RAD; protected float maxKneePitch = 90f * FastMath.DEG_TO_RAD; protected float kneeLerpFactor = 0.5f; - //#region Tracker Input + // #region Tracker Input protected Tracker hmdTracker; protected Tracker neckTracker; protected Tracker chestTracker; @@ -90,19 +145,19 @@ public class SimpleSkeleton extends HumanSkeleton implements SkeletonConfigCallb protected Tracker rightControllerTracker; protected Tracker leftForearmTracker; protected Tracker rightForearmTracker; - //#endregion + // #endregion protected Tracker leftUpperArmTracker; protected Tracker rightUpperArmTracker; protected Tracker leftHandTracker; protected Tracker rightHandTracker; - //#region Tracker Output + // #region Tracker Output protected ComputedHumanPoseTracker computedChestTracker; protected ComputedHumanPoseTracker computedWaistTracker; protected ComputedHumanPoseTracker computedLeftKneeTracker; protected ComputedHumanPoseTracker computedLeftFootTracker; protected ComputedHumanPoseTracker computedRightKneeTracker; protected ComputedHumanPoseTracker computedRightFootTracker; - //#endregion + // #endregion protected ComputedHumanPoseTracker computedLeftElbowTracker; protected ComputedHumanPoseTracker computedRightElbowTracker; protected ComputedHumanPoseTracker computedLeftHandTracker; @@ -111,19 +166,19 @@ public class SimpleSkeleton extends HumanSkeleton implements SkeletonConfigCallb protected boolean extendedKneeModel = false; private Quaternion rotBuf1 = new Quaternion(); private boolean hasSpineTracker, hasKneeTracker; - //#endregion + // #endregion - //#region Constructors + // #region Constructors protected SimpleSkeleton(List computedTrackers) { - //#region Assemble skeleton from hmd to hip + // #region Assemble skeleton from hmd to hip hmdNode.attachChild(headNode); headNode.attachChild(neckNode); neckNode.attachChild(chestNode); chestNode.attachChild(waistNode); waistNode.attachChild(hipNode); - //#endregion + // #endregion - //#region Assemble skeleton from hips to feet + // #region Assemble skeleton from hips to feet hipNode.attachChild(leftHipNode); hipNode.attachChild(rightHipNode); @@ -135,16 +190,16 @@ public class SimpleSkeleton extends HumanSkeleton implements SkeletonConfigCallb leftAnkleNode.attachChild(leftFootNode); rightAnkleNode.attachChild(rightFootNode); - //#endregion + // #endregion - //#region Assemble skeleton arms from controllers + // #region Assemble skeleton arms from controllers leftControllerNodeContrl.attachChild(leftWristNodeContrl); rightControllerNodeContrl.attachChild(rightWristNodeContrl); leftWristNodeContrl.attachChild(leftElbowNodeContrl); rightWristNodeContrl.attachChild(rightElbowNodeContrl); - //#endregion + // #endregion - //#region Assemble skeleton arms from chest + // #region Assemble skeleton arms from chest chestNode.attachChild(leftShoulderNodeHmd); chestNode.attachChild(rightShoulderNodeHmd); @@ -156,9 +211,9 @@ public class SimpleSkeleton extends HumanSkeleton implements SkeletonConfigCallb leftWristNodeHmd.attachChild(leftHandNodeHmd); rightWristNodeHmd.attachChild(rightHandNodeHmd); - //#endregion + // #endregion - //#region Attach tracker nodes for offsets + // #region Attach tracker nodes for offsets chestNode.attachChild(trackerChestNode); hipNode.attachChild(trackerWaistNode); @@ -176,9 +231,11 @@ public class SimpleSkeleton extends HumanSkeleton implements SkeletonConfigCallb leftHandNodeHmd.attachChild(trackerLeftHandNodeHmd); rightHandNodeHmd.attachChild(trackerRightHandNodeHmd); - //#endregion + // #endregion - // Set default skeleton configuration (callback automatically sets initial offsets) + // Set default skeleton configuration (callback automatically sets + // initial + // offsets) skeletonConfig = new SkeletonConfig(true, this); if (computedTrackers != null) { @@ -187,13 +244,19 @@ public class SimpleSkeleton extends HumanSkeleton implements SkeletonConfigCallb fillNullComputedTrackers(true); } - public SimpleSkeleton(VRServer server, List computedTrackers) { + public SimpleSkeleton( + VRServer server, + List computedTrackers + ) { this(computedTrackers); setTrackersFromServer(server); skeletonConfig.loadFromConfig(server.config); } - public SimpleSkeleton(List trackers, List computedTrackers) { + public SimpleSkeleton( + List trackers, + List computedTrackers + ) { this(computedTrackers); if (trackers != null) { @@ -203,22 +266,32 @@ public class SimpleSkeleton extends HumanSkeleton implements SkeletonConfigCallb } } - public SimpleSkeleton(List trackers, List computedTrackers, Map configs, Map altConfigs) { + public SimpleSkeleton( + List trackers, + List computedTrackers, + Map configs, + Map altConfigs + ) { // Initialize this(trackers, computedTrackers); // Set configs if (altConfigs != null) { - // Set alts first, so if there's any overlap it doesn't affect the values + // Set alts first, so if there's any overlap it doesn't affect the + // values skeletonConfig.setConfigs(altConfigs, null); } skeletonConfig.setConfigs(configs, null); } - public SimpleSkeleton(List trackers, List computedTrackers, Map configs) { + public SimpleSkeleton( + List trackers, + List computedTrackers, + Map configs + ) { this(trackers, computedTrackers, configs, null); } - //#endregion + // #endregion public static float normalizeRad(float angle) { return FastMath.normalize(angle, -FastMath.PI, FastMath.PI); @@ -237,33 +310,112 @@ public class SimpleSkeleton extends HumanSkeleton implements SkeletonConfigCallb return normalizeRad(val); } - //#region Set Trackers + // #region Set Trackers public void setTrackersFromList(List trackers, boolean setHmd) { if (setHmd) { - this.hmdTracker = TrackerUtils.findTrackerForBodyPosition(trackers, TrackerPosition.HMD); + this.hmdTracker = TrackerUtils + .findTrackerForBodyPosition(trackers, TrackerPosition.HMD); } - this.neckTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(trackers, TrackerPosition.NECK, TrackerPosition.HMD, null); - this.chestTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(trackers, TrackerPosition.CHEST, TrackerPosition.WAIST, TrackerPosition.HIP); - this.waistTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(trackers, TrackerPosition.WAIST, TrackerPosition.HIP, TrackerPosition.CHEST); - this.hipTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(trackers, TrackerPosition.HIP, TrackerPosition.WAIST, TrackerPosition.CHEST); + this.neckTracker = TrackerUtils + .findTrackerForBodyPositionOrEmpty( + trackers, + TrackerPosition.NECK, + TrackerPosition.HMD, + null + ); + this.chestTracker = TrackerUtils + .findTrackerForBodyPositionOrEmpty( + trackers, + TrackerPosition.CHEST, + TrackerPosition.WAIST, + TrackerPosition.HIP + ); + this.waistTracker = TrackerUtils + .findTrackerForBodyPositionOrEmpty( + trackers, + TrackerPosition.WAIST, + TrackerPosition.HIP, + TrackerPosition.CHEST + ); + this.hipTracker = TrackerUtils + .findTrackerForBodyPositionOrEmpty( + trackers, + TrackerPosition.HIP, + TrackerPosition.WAIST, + TrackerPosition.CHEST + ); - this.leftKneeTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(trackers, TrackerPosition.LEFT_KNEE, TrackerPosition.LEFT_ANKLE, null); - this.leftAnkleTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(trackers, TrackerPosition.LEFT_ANKLE, TrackerPosition.LEFT_KNEE, null); - this.leftFootTracker = TrackerUtils.findTrackerForBodyPosition(trackers, TrackerPosition.LEFT_FOOT); + this.leftKneeTracker = TrackerUtils + .findTrackerForBodyPositionOrEmpty( + trackers, + TrackerPosition.LEFT_KNEE, + TrackerPosition.LEFT_ANKLE, + null + ); + this.leftAnkleTracker = TrackerUtils + .findTrackerForBodyPositionOrEmpty( + trackers, + TrackerPosition.LEFT_ANKLE, + TrackerPosition.LEFT_KNEE, + null + ); + this.leftFootTracker = TrackerUtils + .findTrackerForBodyPosition(trackers, TrackerPosition.LEFT_FOOT); - this.rightKneeTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(trackers, TrackerPosition.RIGHT_KNEE, TrackerPosition.RIGHT_ANKLE, null); - this.rightAnkleTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(trackers, TrackerPosition.RIGHT_ANKLE, TrackerPosition.RIGHT_KNEE, null); - this.rightFootTracker = TrackerUtils.findTrackerForBodyPosition(trackers, TrackerPosition.RIGHT_FOOT); + this.rightKneeTracker = TrackerUtils + .findTrackerForBodyPositionOrEmpty( + trackers, + TrackerPosition.RIGHT_KNEE, + TrackerPosition.RIGHT_ANKLE, + null + ); + this.rightAnkleTracker = TrackerUtils + .findTrackerForBodyPositionOrEmpty( + trackers, + TrackerPosition.RIGHT_ANKLE, + TrackerPosition.RIGHT_KNEE, + null + ); + this.rightFootTracker = TrackerUtils + .findTrackerForBodyPosition(trackers, TrackerPosition.RIGHT_FOOT); - this.leftControllerTracker = TrackerUtils.findTrackerForBodyPosition(trackers, TrackerPosition.LEFT_CONTROLLER); - this.rightControllerTracker = TrackerUtils.findTrackerForBodyPosition(trackers, TrackerPosition.RIGHT_CONTROLLER); - this.leftForearmTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(trackers, TrackerPosition.LEFT_FOREARM, TrackerPosition.LEFT_UPPER_ARM, null); - this.rightForearmTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(trackers, TrackerPosition.RIGHT_FOREARM, TrackerPosition.RIGHT_UPPER_ARM, null); - this.leftUpperArmTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(trackers, TrackerPosition.LEFT_UPPER_ARM, TrackerPosition.LEFT_FOREARM, null); - this.rightUpperArmTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(trackers, TrackerPosition.RIGHT_UPPER_ARM, TrackerPosition.RIGHT_FOREARM, null); - this.leftHandTracker = TrackerUtils.findTrackerForBodyPosition(trackers, TrackerPosition.LEFT_HAND); - this.rightHandTracker = TrackerUtils.findTrackerForBodyPosition(trackers, TrackerPosition.RIGHT_HAND); + this.leftControllerTracker = TrackerUtils + .findTrackerForBodyPosition(trackers, TrackerPosition.LEFT_CONTROLLER); + this.rightControllerTracker = TrackerUtils + .findTrackerForBodyPosition(trackers, TrackerPosition.RIGHT_CONTROLLER); + this.leftForearmTracker = TrackerUtils + .findTrackerForBodyPositionOrEmpty( + trackers, + TrackerPosition.LEFT_FOREARM, + TrackerPosition.LEFT_UPPER_ARM, + null + ); + this.rightForearmTracker = TrackerUtils + .findTrackerForBodyPositionOrEmpty( + trackers, + TrackerPosition.RIGHT_FOREARM, + TrackerPosition.RIGHT_UPPER_ARM, + null + ); + this.leftUpperArmTracker = TrackerUtils + .findTrackerForBodyPositionOrEmpty( + trackers, + TrackerPosition.LEFT_UPPER_ARM, + TrackerPosition.LEFT_FOREARM, + null + ); + this.rightUpperArmTracker = TrackerUtils + .findTrackerForBodyPositionOrEmpty( + trackers, + TrackerPosition.RIGHT_UPPER_ARM, + TrackerPosition.RIGHT_FOREARM, + null + ); + this.leftHandTracker = TrackerUtils + .findTrackerForBodyPosition(trackers, TrackerPosition.LEFT_HAND); + this.rightHandTracker = TrackerUtils + .findTrackerForBodyPosition(trackers, TrackerPosition.RIGHT_HAND); } public void setTrackersFromList(List trackers) { @@ -319,67 +471,110 @@ public class SimpleSkeleton extends HumanSkeleton implements SkeletonConfigCallb setComputedTracker(t); } } - //#endregion + // #endregion - public void setComputedTrackersAndFillNull(List trackers, boolean onlyFillWaistAndFeet) { + public void setComputedTrackersAndFillNull( + List trackers, + boolean onlyFillWaistAndFeet + ) { setComputedTrackers(trackers); fillNullComputedTrackers(onlyFillWaistAndFeet); } - //#endregion + // #endregion public void fillNullComputedTrackers(boolean onlyFillWaistAndFeet) { if (computedWaistTracker == null) { - computedWaistTracker = new ComputedHumanPoseTracker(Tracker.getNextLocalTrackerId(), ComputedHumanPoseTrackerPosition.WAIST, TrackerRole.WAIST); + computedWaistTracker = new ComputedHumanPoseTracker( + Tracker.getNextLocalTrackerId(), + ComputedHumanPoseTrackerPosition.WAIST, + TrackerRole.WAIST + ); computedWaistTracker.setStatus(TrackerStatus.OK); } if (computedLeftFootTracker == null) { - computedLeftFootTracker = new ComputedHumanPoseTracker(Tracker.getNextLocalTrackerId(), ComputedHumanPoseTrackerPosition.LEFT_FOOT, TrackerRole.LEFT_FOOT); + computedLeftFootTracker = new ComputedHumanPoseTracker( + Tracker.getNextLocalTrackerId(), + ComputedHumanPoseTrackerPosition.LEFT_FOOT, + TrackerRole.LEFT_FOOT + ); computedLeftFootTracker.setStatus(TrackerStatus.OK); } if (computedRightFootTracker == null) { - computedRightFootTracker = new ComputedHumanPoseTracker(Tracker.getNextLocalTrackerId(), ComputedHumanPoseTrackerPosition.RIGHT_FOOT, TrackerRole.RIGHT_FOOT); + computedRightFootTracker = new ComputedHumanPoseTracker( + Tracker.getNextLocalTrackerId(), + ComputedHumanPoseTrackerPosition.RIGHT_FOOT, + TrackerRole.RIGHT_FOOT + ); computedRightFootTracker.setStatus(TrackerStatus.OK); } if (!onlyFillWaistAndFeet) { if (computedChestTracker == null) { - computedChestTracker = new ComputedHumanPoseTracker(Tracker.getNextLocalTrackerId(), ComputedHumanPoseTrackerPosition.CHEST, TrackerRole.CHEST); + computedChestTracker = new ComputedHumanPoseTracker( + Tracker.getNextLocalTrackerId(), + ComputedHumanPoseTrackerPosition.CHEST, + TrackerRole.CHEST + ); computedChestTracker.setStatus(TrackerStatus.OK); } if (computedLeftKneeTracker == null) { - computedLeftKneeTracker = new ComputedHumanPoseTracker(Tracker.getNextLocalTrackerId(), ComputedHumanPoseTrackerPosition.LEFT_KNEE, TrackerRole.LEFT_KNEE); + computedLeftKneeTracker = new ComputedHumanPoseTracker( + Tracker.getNextLocalTrackerId(), + ComputedHumanPoseTrackerPosition.LEFT_KNEE, + TrackerRole.LEFT_KNEE + ); computedLeftKneeTracker.setStatus(TrackerStatus.OK); } if (computedRightKneeTracker == null) { - computedRightKneeTracker = new ComputedHumanPoseTracker(Tracker.getNextLocalTrackerId(), ComputedHumanPoseTrackerPosition.RIGHT_KNEE, TrackerRole.RIGHT_KNEE); + computedRightKneeTracker = new ComputedHumanPoseTracker( + Tracker.getNextLocalTrackerId(), + ComputedHumanPoseTrackerPosition.RIGHT_KNEE, + TrackerRole.RIGHT_KNEE + ); computedRightKneeTracker.setStatus(TrackerStatus.OK); } if (computedLeftElbowTracker == null) { - computedLeftElbowTracker = new ComputedHumanPoseTracker(Tracker.getNextLocalTrackerId(), ComputedHumanPoseTrackerPosition.LEFT_ELBOW, TrackerRole.LEFT_ELBOW); + computedLeftElbowTracker = new ComputedHumanPoseTracker( + Tracker.getNextLocalTrackerId(), + ComputedHumanPoseTrackerPosition.LEFT_ELBOW, + TrackerRole.LEFT_ELBOW + ); computedLeftElbowTracker.setStatus(TrackerStatus.OK); } if (computedRightElbowTracker == null) { - computedRightElbowTracker = new ComputedHumanPoseTracker(Tracker.getNextLocalTrackerId(), ComputedHumanPoseTrackerPosition.RIGHT_ELBOW, TrackerRole.RIGHT_ELBOW); + computedRightElbowTracker = new ComputedHumanPoseTracker( + Tracker.getNextLocalTrackerId(), + ComputedHumanPoseTrackerPosition.RIGHT_ELBOW, + TrackerRole.RIGHT_ELBOW + ); computedRightElbowTracker.setStatus(TrackerStatus.OK); } if (computedLeftHandTracker == null) { - computedLeftHandTracker = new ComputedHumanPoseTracker(Tracker.getNextLocalTrackerId(), ComputedHumanPoseTrackerPosition.LEFT_HAND, TrackerRole.LEFT_HAND); + computedLeftHandTracker = new ComputedHumanPoseTracker( + Tracker.getNextLocalTrackerId(), + ComputedHumanPoseTrackerPosition.LEFT_HAND, + TrackerRole.LEFT_HAND + ); computedLeftHandTracker.setStatus(TrackerStatus.OK); } if (computedRightHandTracker == null) { - computedRightHandTracker = new ComputedHumanPoseTracker(Tracker.getNextLocalTrackerId(), ComputedHumanPoseTrackerPosition.RIGHT_HAND, TrackerRole.RIGHT_HAND); + computedRightHandTracker = new ComputedHumanPoseTracker( + Tracker.getNextLocalTrackerId(), + ComputedHumanPoseTrackerPosition.RIGHT_HAND, + TrackerRole.RIGHT_HAND + ); computedRightHandTracker.setStatus(TrackerStatus.OK); } } } - //#region Get Trackers + // #region Get Trackers public ComputedHumanPoseTracker getComputedTracker(TrackerRole trackerRole) { switch (trackerRole) { case CHEST: @@ -411,8 +606,9 @@ public class SimpleSkeleton extends HumanSkeleton implements SkeletonConfigCallb return null; } - //#region Processing - // Useful for sub-classes that need to return a sub-tracker (like PoseFrameTracker -> TrackerFrame) + // #region Processing + // Useful for sub-classes that need to return a sub-tracker (like + // PoseFrameTracker -> TrackerFrame) protected Tracker trackerPreUpdate(Tracker tracker) { return tracker; } @@ -425,7 +621,7 @@ public class SimpleSkeleton extends HumanSkeleton implements SkeletonConfigCallb updateRootTrackers(); updateComputedTrackers(); } - //#endregion + // #endregion void updateRootTrackers() { hmdNode.update(); @@ -433,9 +629,9 @@ public class SimpleSkeleton extends HumanSkeleton implements SkeletonConfigCallb rightControllerNodeContrl.update(); } - //#region Update the node transforms from the trackers + // #region Update the node transforms from the trackers protected void updateLocalTransforms() { - //#region Pass all trackers through trackerPreUpdate + // #region Pass all trackers through trackerPreUpdate Tracker hmdTracker = trackerPreUpdate(this.hmdTracker); Tracker neckTracker = trackerPreUpdate(this.neckTracker); @@ -459,9 +655,11 @@ public class SimpleSkeleton extends HumanSkeleton implements SkeletonConfigCallb Tracker leftUpperArmTracker = trackerPreUpdate(this.leftUpperArmTracker); Tracker leftHandTracker = trackerPreUpdate(this.leftHandTracker); Tracker rightHandTracker = trackerPreUpdate(this.rightHandTracker); - //#endregion + // #endregion - hasSpineTracker = chestTracker.hasRotation() || waistTracker.hasRotation() || hipTracker.hasRotation(); + hasSpineTracker = chestTracker.hasRotation() + || waistTracker.hasRotation() + || hipTracker.hasRotation(); hasKneeTracker = leftKneeTracker.hasRotation() || rightKneeTracker.hasRotation(); if (hmdTracker != null) { @@ -494,7 +692,8 @@ public class SimpleSkeleton extends HumanSkeleton implements SkeletonConfigCallb hipNode.localTransform.setRotation(rotBuf1); trackerWaistNode.localTransform.setRotation(rotBuf1); } - } else if (hmdTracker != null) { // If no spine tracker, allign spine yaw with HMD + } else if (hmdTracker != null) { // If no spine tracker, allign spine + // yaw with HMD rotBuf1 = rotBuf1.fromAngles(0, rotBuf1.getYaw(), 0); neckNode.localTransform.setRotation(rotBuf1); chestNode.localTransform.setRotation(rotBuf1); @@ -509,7 +708,12 @@ public class SimpleSkeleton extends HumanSkeleton implements SkeletonConfigCallb leftAnkleTracker.getRotation(rotBuf2); if (extendedKneeModel) - calculateKneeLimits(rotBuf1, rotBuf2, leftKneeTracker.getConfidenceLevel(), leftAnkleTracker.getConfidenceLevel()); + calculateKneeLimits( + rotBuf1, + rotBuf2, + leftKneeTracker.getConfidenceLevel(), + leftAnkleTracker.getConfidenceLevel() + ); leftHipNode.localTransform.setRotation(rotBuf1); leftKneeNode.localTransform.setRotation(rotBuf2); @@ -531,7 +735,12 @@ public class SimpleSkeleton extends HumanSkeleton implements SkeletonConfigCallb rightAnkleTracker.getRotation(rotBuf2); if (extendedKneeModel) - calculateKneeLimits(rotBuf1, rotBuf2, rightKneeTracker.getConfidenceLevel(), rightAnkleTracker.getConfidenceLevel()); + calculateKneeLimits( + rotBuf1, + rotBuf2, + rightKneeTracker.getConfidenceLevel(), + rightAnkleTracker.getConfidenceLevel() + ); rightHipNode.localTransform.setRotation(rotBuf1); rightKneeNode.localTransform.setRotation(rotBuf2); @@ -556,9 +765,16 @@ public class SimpleSkeleton extends HumanSkeleton implements SkeletonConfigCallb chestNode.localTransform.getRotation(rotBuf1); rotBuf2.nlerp(rotBuf1, FastMath.ONE_THIRD); hipNode.localTransform.setRotation(rotBuf2); - //trackerWaistNode.localTransform.setRotation(rotBuf2); // <== Provides cursed results from my test in VRChat when sitting or laying down -Erimel - // TODO : Correct the trackerWaistNode without getting cursed results (only correct yaw?) - // TODO : Use vectors to add like 50% of waist tracker yaw to waist node to reduce drift and let user take weird poses + // trackerWaistNode.localTransform.setRotation(rotBuf2); // <== + // Provides cursed + // results from my test in VRChat when sitting or laying down + // -Erimel + // TODO : Correct the trackerWaistNode without getting cursed + // results (only + // correct yaw?) + // TODO : Use vectors to add like 50% of waist tracker yaw to waist + // node to + // reduce drift and let user take weird poses } // Left arm from HMD @@ -622,29 +838,38 @@ public class SimpleSkeleton extends HumanSkeleton implements SkeletonConfigCallb } } - //#region Knee Model - // Knee basically has only 1 DoF (pitch), average yaw and roll between knee and hip - protected void calculateKneeLimits(Quaternion hipBuf, Quaternion kneeBuf, float hipConfidence, float kneeConfidence) { + // #region Knee Model + // Knee basically has only 1 DoF (pitch), average yaw and roll between knee + // and + // hip + protected void calculateKneeLimits( + Quaternion hipBuf, + Quaternion kneeBuf, + float hipConfidence, + float kneeConfidence + ) { ankleVector.set(0, -1, 0); hipVector.set(0, -1, 0); hipBuf.multLocal(hipVector); kneeBuf.multLocal(ankleVector); - kneeRotation.angleBetweenVectors(hipVector, ankleVector); // Find knee angle + kneeRotation.angleBetweenVectors(hipVector, ankleVector); // Find knee + // angle // Substract knee angle from knee rotation. With perfect leg and perfect // sensors result should match hip rotation perfectly kneeBuf.multLocal(kneeRotation.inverse()); // Average knee and hip with a slerp - hipBuf.slerp(kneeBuf, 0.5f); // TODO : Use confidence to calculate changeAmt + hipBuf.slerp(kneeBuf, 0.5f); // TODO : Use confidence to calculate + // changeAmt kneeBuf.set(hipBuf); // Return knee angle into knee rotation kneeBuf.multLocal(kneeRotation); } - //#endregion + // #endregion - //#region Update the output trackers + // #region Update the output trackers protected void updateComputedTrackers() { if (computedChestTracker != null) { computedChestTracker.position.set(trackerChestNode.worldTransform.getTranslation()); @@ -659,67 +884,84 @@ public class SimpleSkeleton extends HumanSkeleton implements SkeletonConfigCallb } if (computedLeftKneeTracker != null) { - computedLeftKneeTracker.position.set(trackerLeftKneeNode.worldTransform.getTranslation()); + computedLeftKneeTracker.position + .set(trackerLeftKneeNode.worldTransform.getTranslation()); computedLeftKneeTracker.rotation.set(leftHipNode.worldTransform.getRotation()); computedLeftKneeTracker.dataTick(); } if (computedLeftFootTracker != null) { - computedLeftFootTracker.position.set(trackerLeftFootNode.worldTransform.getTranslation()); + computedLeftFootTracker.position + .set(trackerLeftFootNode.worldTransform.getTranslation()); computedLeftFootTracker.rotation.set(trackerLeftFootNode.worldTransform.getRotation()); computedLeftFootTracker.dataTick(); } if (computedRightKneeTracker != null) { - computedRightKneeTracker.position.set(trackerRightKneeNode.worldTransform.getTranslation()); + computedRightKneeTracker.position + .set(trackerRightKneeNode.worldTransform.getTranslation()); computedRightKneeTracker.rotation.set(rightHipNode.worldTransform.getRotation()); computedRightKneeTracker.dataTick(); } if (computedRightFootTracker != null) { - computedRightFootTracker.position.set(trackerRightFootNode.worldTransform.getTranslation()); - computedRightFootTracker.rotation.set(trackerRightFootNode.worldTransform.getRotation()); + computedRightFootTracker.position + .set(trackerRightFootNode.worldTransform.getTranslation()); + computedRightFootTracker.rotation + .set(trackerRightFootNode.worldTransform.getRotation()); computedRightFootTracker.dataTick(); } if (computedLeftElbowTracker != null) { if (leftControllerTracker != null) { // From controller - computedLeftElbowTracker.position.set(trackerLeftElbowNodeContrl.worldTransform.getTranslation()); - computedLeftElbowTracker.rotation.set(trackerLeftElbowNodeContrl.worldTransform.getRotation()); + computedLeftElbowTracker.position + .set(trackerLeftElbowNodeContrl.worldTransform.getTranslation()); + computedLeftElbowTracker.rotation + .set(trackerLeftElbowNodeContrl.worldTransform.getRotation()); } else { // From shoulders - computedLeftElbowTracker.position.set(trackerLeftElbowNodeHmd.worldTransform.getTranslation()); - computedLeftElbowTracker.rotation.set(trackerLeftElbowNodeHmd.worldTransform.getRotation()); + computedLeftElbowTracker.position + .set(trackerLeftElbowNodeHmd.worldTransform.getTranslation()); + computedLeftElbowTracker.rotation + .set(trackerLeftElbowNodeHmd.worldTransform.getRotation()); } computedLeftElbowTracker.dataTick(); } if (computedRightElbowTracker != null) { if (rightControllerTracker != null) { // From controller - computedRightElbowTracker.position.set(trackerRightElbowNodeContrl.worldTransform.getTranslation()); - computedRightElbowTracker.rotation.set(trackerRightElbowNodeContrl.worldTransform.getRotation()); + computedRightElbowTracker.position + .set(trackerRightElbowNodeContrl.worldTransform.getTranslation()); + computedRightElbowTracker.rotation + .set(trackerRightElbowNodeContrl.worldTransform.getRotation()); } else { // From shoulders - computedRightElbowTracker.position.set(trackerRightElbowNodeHmd.worldTransform.getTranslation()); - computedRightElbowTracker.rotation.set(trackerRightElbowNodeHmd.worldTransform.getRotation()); + computedRightElbowTracker.position + .set(trackerRightElbowNodeHmd.worldTransform.getTranslation()); + computedRightElbowTracker.rotation + .set(trackerRightElbowNodeHmd.worldTransform.getRotation()); } computedRightElbowTracker.dataTick(); } if (computedLeftHandTracker != null) { - computedLeftHandTracker.position.set(trackerLeftHandNodeHmd.worldTransform.getTranslation()); - computedLeftHandTracker.rotation.set(trackerLeftHandNodeHmd.worldTransform.getRotation()); + computedLeftHandTracker.position + .set(trackerLeftHandNodeHmd.worldTransform.getTranslation()); + computedLeftHandTracker.rotation + .set(trackerLeftHandNodeHmd.worldTransform.getRotation()); computedLeftHandTracker.dataTick(); } if (computedRightHandTracker != null) { - computedRightHandTracker.position.set(trackerRightHandNodeHmd.worldTransform.getTranslation()); - computedRightHandTracker.rotation.set(trackerRightHandNodeHmd.worldTransform.getRotation()); + computedRightHandTracker.position + .set(trackerRightHandNodeHmd.worldTransform.getTranslation()); + computedRightHandTracker.rotation + .set(trackerRightHandNodeHmd.worldTransform.getRotation()); computedRightHandTracker.dataTick(); } } - //#endregion - //#endregion + // #endregion + // #endregion - //#region Skeleton Config + // #region Skeleton Config @Override public void updateConfigState(SkeletonConfigValue config, float newValue) { // Do nothing, the node offset callback handles all that's needed @@ -926,7 +1168,7 @@ public class SimpleSkeleton extends HumanSkeleton implements SkeletonConfigCallb break; } } - //#endregion + // #endregion @Override public TransformNode getRootNode() { @@ -974,15 +1216,27 @@ public class SimpleSkeleton extends HumanSkeleton implements SkeletonConfigCallb vec = new Vector3f(); hmdTracker.getPosition(vec); height = vec.y; - if (height > 0.5f) { // Reset only if floor level is right, TODO: read floor level from SteamVR if it's not 0 - skeletonConfig.setConfig(SkeletonConfigValue.TORSO, ((height) * 0.42f) - skeletonConfig.getConfig(SkeletonConfigValue.NECK)); + if (height > 0.5f) { // Reset only if floor level is right, + // TODO: read floor level from SteamVR + // if + // it's not 0 + skeletonConfig + .setConfig( + SkeletonConfigValue.TORSO, + ((height) * 0.42f) - skeletonConfig.getConfig(SkeletonConfigValue.NECK) + ); } else// if floor level is incorrect { skeletonConfig.setConfig(SkeletonConfigValue.TORSO, null); } break; - case CHEST: // Chest is 57% of the upper body by default (shoulders to chest) - skeletonConfig.setConfig(SkeletonConfigValue.CHEST, skeletonConfig.getConfig(SkeletonConfigValue.TORSO) * 0.57f); + case CHEST: // Chest is 57% of the upper body by default (shoulders + // to chest) + skeletonConfig + .setConfig( + SkeletonConfigValue.CHEST, + skeletonConfig.getConfig(SkeletonConfigValue.TORSO) * 0.57f + ); break; case WAIST: // Waist length is from hip to waist skeletonConfig.setConfig(SkeletonConfigValue.WAIST, null); @@ -1006,8 +1260,18 @@ public class SimpleSkeleton extends HumanSkeleton implements SkeletonConfigCallb vec = new Vector3f(); hmdTracker.getPosition(vec); height = vec.y; - if (height > 0.5f) { // Reset only if floor level is right, todo: read floor level from SteamVR if it's not 0 - skeletonConfig.setConfig(SkeletonConfigValue.LEGS_LENGTH, height - skeletonConfig.getConfig(SkeletonConfigValue.NECK) - skeletonConfig.getConfig(SkeletonConfigValue.TORSO) - 0.05f); + if (height > 0.5f) { // Reset only if floor level is right, + // todo: read floor level from SteamVR + // if + // it's not 0 + skeletonConfig + .setConfig( + SkeletonConfigValue.LEGS_LENGTH, + height + - skeletonConfig.getConfig(SkeletonConfigValue.NECK) + - skeletonConfig.getConfig(SkeletonConfigValue.TORSO) + - 0.05f + ); } else // if floor level is incorrect { skeletonConfig.setConfig(SkeletonConfigValue.LEGS_LENGTH, null); @@ -1015,7 +1279,11 @@ public class SimpleSkeleton extends HumanSkeleton implements SkeletonConfigCallb resetSkeletonConfig(SkeletonConfigValue.KNEE_HEIGHT); break; case KNEE_HEIGHT: // Knees are at 55% of the legs by default - skeletonConfig.setConfig(SkeletonConfigValue.KNEE_HEIGHT, skeletonConfig.getConfig(SkeletonConfigValue.LEGS_LENGTH) * 0.55f); + skeletonConfig + .setConfig( + SkeletonConfigValue.KNEE_HEIGHT, + skeletonConfig.getConfig(SkeletonConfigValue.LEGS_LENGTH) * 0.55f + ); break; case CONTROLLER_DISTANCE_Z: skeletonConfig.setConfig(SkeletonConfigValue.CONTROLLER_DISTANCE_Z, null); @@ -1042,23 +1310,23 @@ public class SimpleSkeleton extends HumanSkeleton implements SkeletonConfigCallb } Tracker[] getTrackerToReset() { - return new Tracker[]{ - trackerPreUpdate(this.neckTracker), trackerPreUpdate(this.chestTracker), - trackerPreUpdate(this.waistTracker), trackerPreUpdate(this.hipTracker), - trackerPreUpdate(this.leftKneeTracker), trackerPreUpdate(this.leftAnkleTracker), - trackerPreUpdate(this.leftFootTracker), trackerPreUpdate(this.rightKneeTracker), - trackerPreUpdate(this.rightAnkleTracker), trackerPreUpdate(this.rightFootTracker), - trackerPreUpdate(this.rightForearmTracker), trackerPreUpdate(this.leftForearmTracker), - trackerPreUpdate(this.rightUpperArmTracker), trackerPreUpdate(this.leftUpperArmTracker), - trackerPreUpdate(this.leftHandTracker), trackerPreUpdate(this.rightHandTracker)}; + return new Tracker[] { trackerPreUpdate(this.neckTracker), + trackerPreUpdate(this.chestTracker), trackerPreUpdate(this.waistTracker), + trackerPreUpdate(this.hipTracker), trackerPreUpdate(this.leftKneeTracker), + trackerPreUpdate(this.leftAnkleTracker), trackerPreUpdate(this.leftFootTracker), + trackerPreUpdate(this.rightKneeTracker), trackerPreUpdate(this.rightAnkleTracker), + trackerPreUpdate(this.rightFootTracker), trackerPreUpdate(this.rightForearmTracker), + trackerPreUpdate(this.leftForearmTracker), trackerPreUpdate(this.rightUpperArmTracker), + trackerPreUpdate(this.leftUpperArmTracker), trackerPreUpdate(this.leftHandTracker), + trackerPreUpdate(this.rightHandTracker) }; } @Override public void resetTrackersFull() { - //#region Pass all trackers through trackerPreUpdate + // #region Pass all trackers through trackerPreUpdate Tracker hmdTracker = trackerPreUpdate(this.hmdTracker); Tracker[] trackersToReset = getTrackerToReset(); - //#endregion + // #endregion // Resets all axis of the trackers with the HMD as reference. Quaternion referenceRotation = new Quaternion(); @@ -1074,10 +1342,10 @@ public class SimpleSkeleton extends HumanSkeleton implements SkeletonConfigCallb @Override @VRServerThread public void resetTrackersYaw() { - //#region Pass all trackers through trackerPreUpdate + // #region Pass all trackers through trackerPreUpdate Tracker hmdTracker = trackerPreUpdate(this.hmdTracker); Tracker[] trackersToReset = getTrackerToReset(); - //#endregion + // #endregion // Resets the yaw of the trackers with the HMD as reference. Quaternion referenceRotation = new Quaternion(); diff --git a/src/main/java/dev/slimevr/vr/processor/skeleton/SkeletonConfig.java b/src/main/java/dev/slimevr/vr/processor/skeleton/SkeletonConfig.java index d2554911c..dad1a8785 100644 --- a/src/main/java/dev/slimevr/vr/processor/skeleton/SkeletonConfig.java +++ b/src/main/java/dev/slimevr/vr/processor/skeleton/SkeletonConfig.java @@ -7,11 +7,18 @@ import io.eiren.yaml.YamlFile; import java.util.EnumMap; import java.util.Map; + public class SkeletonConfig { - protected final EnumMap configs = new EnumMap(SkeletonConfigValue.class); - protected final EnumMap toggles = new EnumMap(SkeletonConfigToggle.class); - protected final EnumMap nodeOffsets = new EnumMap(SkeletonNodeOffset.class); + protected final EnumMap configs = new EnumMap( + SkeletonConfigValue.class + ); + protected final EnumMap toggles = new EnumMap( + SkeletonConfigToggle.class + ); + protected final EnumMap nodeOffsets = new EnumMap( + SkeletonNodeOffset.class + ); protected final boolean autoUpdateOffsets; protected final SkeletonConfigCallback callback; @@ -38,7 +45,12 @@ public class SkeletonConfig { } } - public SkeletonConfig(Map configs, Map toggles, boolean autoUpdateOffsets, SkeletonConfigCallback callback) { + public SkeletonConfig( + Map configs, + Map toggles, + boolean autoUpdateOffsets, + SkeletonConfigCallback callback + ) { this.autoUpdateOffsets = autoUpdateOffsets; this.callback = callback; setConfigs(configs, toggles); @@ -46,11 +58,19 @@ public class SkeletonConfig { callCallbackOnAll(true); } - public SkeletonConfig(Map configs, Map toggles, boolean autoUpdateOffsets) { + public SkeletonConfig( + Map configs, + Map toggles, + boolean autoUpdateOffsets + ) { this(configs, toggles, autoUpdateOffsets, null); } - public SkeletonConfig(SkeletonConfig skeletonConfig, boolean autoUpdateOffsets, SkeletonConfigCallback callback) { + public SkeletonConfig( + SkeletonConfig skeletonConfig, + boolean autoUpdateOffsets, + SkeletonConfigCallback callback + ) { this.autoUpdateOffsets = autoUpdateOffsets; this.callback = callback; setConfigs(skeletonConfig); @@ -62,7 +82,7 @@ public class SkeletonConfig { this(skeletonConfig, autoUpdateOffsets, null); } - //#region Cast utilities for config reading + // #region Cast utilities for config reading private static Float castFloat(Object o) { if (o == null) { return null; @@ -103,7 +123,7 @@ public class SkeletonConfig { callback.updateConfigState(config, val == null ? config.defaultValue : val); } } catch (Exception e) { - LogManager.log.severe("[SkeletonConfig] Exception while calling callback", e); + LogManager.severe("[SkeletonConfig] Exception while calling callback", e); } } @@ -114,7 +134,7 @@ public class SkeletonConfig { callback.updateToggleState(config, val == null ? config.defaultValue : val); } } catch (Exception e) { - LogManager.log.severe("[SkeletonConfig] Exception while calling callback", e); + LogManager.severe("[SkeletonConfig] Exception while calling callback", e); } } } @@ -131,9 +151,10 @@ public class SkeletonConfig { if (callback != null) { try { - callback.updateConfigState(config, newValue != null ? newValue : config.defaultValue); + callback + .updateConfigState(config, newValue != null ? newValue : config.defaultValue); } catch (Exception e) { - LogManager.log.severe("[SkeletonConfig] Exception while calling callback", e); + LogManager.severe("[SkeletonConfig] Exception while calling callback", e); } } @@ -153,7 +174,9 @@ public class SkeletonConfig { return 0f; } - // IMPORTANT!! This null check is necessary, getOrDefault seems to randomly decide to return null at times, so this is a secondary check + // IMPORTANT!! This null check is necessary, getOrDefault seems to + // randomly + // decide to return null at times, so this is a secondary check Float val = configs.getOrDefault(config, config.defaultValue); return val != null ? val : config.defaultValue; } @@ -170,9 +193,10 @@ public class SkeletonConfig { if (callback != null) { try { - callback.updateToggleState(config, newValue != null ? newValue : config.defaultValue); + callback + .updateToggleState(config, newValue != null ? newValue : config.defaultValue); } catch (Exception e) { - LogManager.log.severe("[SkeletonConfig] Exception while calling callback", e); + LogManager.severe("[SkeletonConfig] Exception while calling callback", e); } } @@ -188,7 +212,9 @@ public class SkeletonConfig { return false; } - // IMPORTANT!! This null check is necessary, getOrDefault seems to randomly decide to return null at times, so this is a secondary check + // IMPORTANT!! This null check is necessary, getOrDefault seems to + // randomly + // decide to return null at times, so this is a secondary check Boolean val = toggles.getOrDefault(config, config.defaultValue); return val != null ? val : config.defaultValue; } @@ -215,7 +241,7 @@ public class SkeletonConfig { try { callback.updateNodeOffset(nodeOffset, offset); } catch (Exception e) { - LogManager.log.severe("[SkeletonConfig] Exception while calling callback", e); + LogManager.severe("[SkeletonConfig] Exception while calling callback", e); } } } @@ -248,13 +274,25 @@ public class SkeletonConfig { setNodeOffset(nodeOffset, 0, 0, -getConfig(SkeletonConfigValue.SKELETON_OFFSET)); break; case WAIST: - setNodeOffset(nodeOffset, 0, (getConfig(SkeletonConfigValue.CHEST) - getConfig(SkeletonConfigValue.TORSO) + getConfig(SkeletonConfigValue.WAIST)), 0); + setNodeOffset( + nodeOffset, + 0, + (getConfig(SkeletonConfigValue.CHEST) + - getConfig(SkeletonConfigValue.TORSO) + + getConfig(SkeletonConfigValue.WAIST)), + 0 + ); break; case HIP: setNodeOffset(nodeOffset, 0, -getConfig(SkeletonConfigValue.WAIST), 0); break; case HIP_TRACKER: - setNodeOffset(nodeOffset, 0, getConfig(SkeletonConfigValue.HIP_OFFSET), -getConfig(SkeletonConfigValue.SKELETON_OFFSET)); + setNodeOffset( + nodeOffset, + 0, + getConfig(SkeletonConfigValue.HIP_OFFSET), + -getConfig(SkeletonConfigValue.SKELETON_OFFSET) + ); break; case LEFT_HIP: @@ -265,13 +303,24 @@ public class SkeletonConfig { break; case KNEE: - setNodeOffset(nodeOffset, 0, -(getConfig(SkeletonConfigValue.LEGS_LENGTH) - getConfig(SkeletonConfigValue.KNEE_HEIGHT)), 0); + setNodeOffset( + nodeOffset, + 0, + -(getConfig(SkeletonConfigValue.LEGS_LENGTH) + - getConfig(SkeletonConfigValue.KNEE_HEIGHT)), + 0 + ); break; case KNEE_TRACKER: setNodeOffset(nodeOffset, 0, 0, -getConfig(SkeletonConfigValue.SKELETON_OFFSET)); break; case ANKLE: - setNodeOffset(nodeOffset, 0, -getConfig(SkeletonConfigValue.KNEE_HEIGHT), -getConfig(SkeletonConfigValue.FOOT_OFFSET)); + setNodeOffset( + nodeOffset, + 0, + -getConfig(SkeletonConfigValue.KNEE_HEIGHT), + -getConfig(SkeletonConfigValue.FOOT_OFFSET) + ); break; case FOOT: setNodeOffset(nodeOffset, 0, 0, -getConfig(SkeletonConfigValue.FOOT_LENGTH)); @@ -281,10 +330,20 @@ public class SkeletonConfig { break; case CONTROLLER: - setNodeOffset(nodeOffset, 0, getConfig(SkeletonConfigValue.CONTROLLER_DISTANCE_Y), getConfig(SkeletonConfigValue.CONTROLLER_DISTANCE_Z)); + setNodeOffset( + nodeOffset, + 0, + getConfig(SkeletonConfigValue.CONTROLLER_DISTANCE_Y), + getConfig(SkeletonConfigValue.CONTROLLER_DISTANCE_Z) + ); break; case HAND: - setNodeOffset(nodeOffset, 0, -getConfig(SkeletonConfigValue.CONTROLLER_DISTANCE_Y), -getConfig(SkeletonConfigValue.CONTROLLER_DISTANCE_Z)); + setNodeOffset( + nodeOffset, + 0, + -getConfig(SkeletonConfigValue.CONTROLLER_DISTANCE_Y), + -getConfig(SkeletonConfigValue.CONTROLLER_DISTANCE_Z) + ); break; case FOREARM_CONTRL: setNodeOffset(nodeOffset, 0, getConfig(SkeletonConfigValue.FOREARM_LENGTH), 0); @@ -299,10 +358,22 @@ public class SkeletonConfig { setNodeOffset(nodeOffset, 0, -getConfig(SkeletonConfigValue.UPPER_ARM_LENGTH), 0); break; case LEFT_SHOULDER: - setNodeOffset(nodeOffset, -getConfig(SkeletonConfigValue.SHOULDERS_WIDTH) / 2f, getConfig(SkeletonConfigValue.CHEST) - getConfig(SkeletonConfigValue.SHOULDERS_DISTANCE), 0); + setNodeOffset( + nodeOffset, + -getConfig(SkeletonConfigValue.SHOULDERS_WIDTH) / 2f, + getConfig(SkeletonConfigValue.CHEST) + - getConfig(SkeletonConfigValue.SHOULDERS_DISTANCE), + 0 + ); break; case RIGHT_SHOULDER: - setNodeOffset(nodeOffset, getConfig(SkeletonConfigValue.SHOULDERS_WIDTH) / 2f, getConfig(SkeletonConfigValue.CHEST) - getConfig(SkeletonConfigValue.SHOULDERS_DISTANCE), 0); + setNodeOffset( + nodeOffset, + getConfig(SkeletonConfigValue.SHOULDERS_WIDTH) / 2f, + getConfig(SkeletonConfigValue.CHEST) + - getConfig(SkeletonConfigValue.SHOULDERS_DISTANCE), + 0 + ); break; } } @@ -313,10 +384,14 @@ public class SkeletonConfig { } } - public void setConfigs(Map configs, Map toggles) { + public void setConfigs( + Map configs, + Map toggles + ) { if (configs != null) { configs.forEach((key, value) -> { - // Do not recalculate the offsets, these are done in bulk at the end + // Do not recalculate the offsets, these are done in bulk at the + // end setConfig(key, value, false); }); } @@ -333,7 +408,8 @@ public class SkeletonConfig { public void setStringConfigs(Map configs, Map toggles) { if (configs != null) { configs.forEach((key, value) -> { - // Do not recalculate the offsets, these are done in bulk at the end + // Do not recalculate the offsets, these are done in bulk at the + // end setConfig(SkeletonConfigValue.getByStringValue(key), value, false); }); } @@ -352,13 +428,14 @@ public class SkeletonConfig { public void setConfigs(SkeletonConfig skeletonConfig) { setConfigs(skeletonConfig.configs, skeletonConfig.toggles); } - //#endregion + // #endregion public void loadFromConfig(YamlFile config) { for (SkeletonConfigValue configValue : SkeletonConfigValue.values) { Float val = castFloat(config.getProperty(configValue.configKey)); if (val != null) { - // Do not recalculate the offsets, these are done in bulk at the end + // Do not recalculate the offsets, these are done in bulk at the + // end setConfig(configValue, val, false); } } @@ -376,7 +453,9 @@ public class SkeletonConfig { } public void saveToConfig(YamlFile config) { - // Write all possible values, this keeps configs consistent even if defaults were changed + // Write all possible values, this keeps configs consistent even if + // defaults + // were changed for (SkeletonConfigValue value : SkeletonConfigValue.values) { config.setProperty(value.configKey, getConfig(value)); } diff --git a/src/main/java/dev/slimevr/vr/processor/skeleton/SkeletonConfigCallback.java b/src/main/java/dev/slimevr/vr/processor/skeleton/SkeletonConfigCallback.java index 09d894d88..6f243a336 100644 --- a/src/main/java/dev/slimevr/vr/processor/skeleton/SkeletonConfigCallback.java +++ b/src/main/java/dev/slimevr/vr/processor/skeleton/SkeletonConfigCallback.java @@ -2,6 +2,7 @@ package dev.slimevr.vr.processor.skeleton; import com.jme3.math.Vector3f; + public interface SkeletonConfigCallback { void updateConfigState(SkeletonConfigValue config, float newValue); diff --git a/src/main/java/dev/slimevr/vr/processor/skeleton/SkeletonConfigToggle.java b/src/main/java/dev/slimevr/vr/processor/skeleton/SkeletonConfigToggle.java index 23a79de5d..f2e476e76 100644 --- a/src/main/java/dev/slimevr/vr/processor/skeleton/SkeletonConfigToggle.java +++ b/src/main/java/dev/slimevr/vr/processor/skeleton/SkeletonConfigToggle.java @@ -3,11 +3,11 @@ package dev.slimevr.vr.processor.skeleton; import java.util.HashMap; import java.util.Map; + public enum SkeletonConfigToggle { EXTENDED_PELVIS_MODEL("Extended pelvis model", "extendedPelvis", true), - EXTENDED_KNEE_MODEL("Extended knee model", "extendedKnee", false), - ; + EXTENDED_KNEE_MODEL("Extended knee model", "extendedKnee", false),; public static final SkeletonConfigToggle[] values = values(); private static final String CONFIG_PREFIX = "body.model."; diff --git a/src/main/java/dev/slimevr/vr/processor/skeleton/SkeletonConfigValue.java b/src/main/java/dev/slimevr/vr/processor/skeleton/SkeletonConfigValue.java index 84d377341..e9ad1c048 100644 --- a/src/main/java/dev/slimevr/vr/processor/skeleton/SkeletonConfigValue.java +++ b/src/main/java/dev/slimevr/vr/processor/skeleton/SkeletonConfigValue.java @@ -3,27 +3,165 @@ package dev.slimevr.vr.processor.skeleton; import java.util.HashMap; import java.util.Map; + public enum SkeletonConfigValue { - HEAD(1, "Head", "headShift", "Head shift", 0.1f, new SkeletonNodeOffset[]{SkeletonNodeOffset.HEAD}), - NECK(2, "Neck", "neckLength", "Neck length", 0.1f, new SkeletonNodeOffset[]{SkeletonNodeOffset.NECK}), - TORSO(3, "Torso", "torsoLength", "Torso length", 0.56f, new SkeletonNodeOffset[]{SkeletonNodeOffset.WAIST}), - CHEST(4, "Chest", "chestDistance", "Chest distance", 0.32f, new SkeletonNodeOffset[]{SkeletonNodeOffset.CHEST, SkeletonNodeOffset.WAIST, SkeletonNodeOffset.LEFT_SHOULDER, SkeletonNodeOffset.RIGHT_SHOULDER}), - WAIST(5, "Waist", "waistDistance", "Waist distance", 0.04f, new SkeletonNodeOffset[]{SkeletonNodeOffset.WAIST, SkeletonNodeOffset.HIP}), - HIP_OFFSET(6, "Hip offset", "hipOffset", "Hip offset", 0.0f, new SkeletonNodeOffset[]{SkeletonNodeOffset.HIP_TRACKER}), - HIPS_WIDTH(7, "Hips width", "hipsWidth", "Hips width", 0.26f, new SkeletonNodeOffset[]{SkeletonNodeOffset.LEFT_HIP, SkeletonNodeOffset.RIGHT_HIP}), - LEGS_LENGTH(8, "Legs length", "legsLength", "Legs length", 0.92f, new SkeletonNodeOffset[]{SkeletonNodeOffset.KNEE}), - KNEE_HEIGHT(9, "Knee height", "kneeHeight", "Knee height", 0.50f, new SkeletonNodeOffset[]{SkeletonNodeOffset.KNEE, SkeletonNodeOffset.ANKLE}), - FOOT_LENGTH(10, "Foot length", "footLength", "Foot length", 0.05f, new SkeletonNodeOffset[]{SkeletonNodeOffset.FOOT}), - FOOT_OFFSET(11, "Foot offset", "footOffset", "Foot offset", -0.05f, new SkeletonNodeOffset[]{SkeletonNodeOffset.ANKLE}), - SKELETON_OFFSET(12, "Skeleton offset", "skeletonOffset", "Skeleton offset", 0.0f, new SkeletonNodeOffset[]{SkeletonNodeOffset.CHEST_TRACKER, SkeletonNodeOffset.HIP_TRACKER, SkeletonNodeOffset.KNEE_TRACKER, SkeletonNodeOffset.FOOT_TRACKER}), - CONTROLLER_DISTANCE_Z(13, "Controller distance z", "controllerDistanceZ", "Controller distance z", 0.15f, new SkeletonNodeOffset[]{SkeletonNodeOffset.CONTROLLER, SkeletonNodeOffset.HAND}), - CONTROLLER_DISTANCE_Y(14, "Controller distance y", "controllerDistanceY", "Controller distance y", 0.05f, new SkeletonNodeOffset[]{SkeletonNodeOffset.CONTROLLER, SkeletonNodeOffset.HAND}), - FOREARM_LENGTH(15, "Forearm length", "forearmLength", "Forearm length", 0.25f, new SkeletonNodeOffset[]{SkeletonNodeOffset.FOREARM_CONTRL, SkeletonNodeOffset.FOREARM_HMD}), - SHOULDERS_DISTANCE(16, "Shoulders distance", "shoulersDistance", "Shoulders distance", 0.08f, new SkeletonNodeOffset[]{SkeletonNodeOffset.LEFT_SHOULDER, SkeletonNodeOffset.RIGHT_SHOULDER}), - SHOULDERS_WIDTH(17, "Shoulders width", "shoulersWidth", "Shoulders width", 0.36f, new SkeletonNodeOffset[]{SkeletonNodeOffset.LEFT_SHOULDER, SkeletonNodeOffset.RIGHT_SHOULDER}), - UPPER_ARM_LENGTH(18, "Upper arm length", "upperArmLength", "Upper arm length", 0.25f, new SkeletonNodeOffset[]{SkeletonNodeOffset.UPPER_ARM}), - ELBOW_OFFSET(19, "Elbow offset", "elbowOffset", "Elbow offset", 0f, new SkeletonNodeOffset[]{SkeletonNodeOffset.ELBOW_TRACKER}), - ; + HEAD( + 1, + "Head", + "headShift", + "Head shift", + 0.1f, + new SkeletonNodeOffset[] { SkeletonNodeOffset.HEAD } + ), + NECK( + 2, + "Neck", + "neckLength", + "Neck length", + 0.1f, + new SkeletonNodeOffset[] { SkeletonNodeOffset.NECK } + ), + TORSO( + 3, + "Torso", + "torsoLength", + "Torso length", + 0.56f, + new SkeletonNodeOffset[] { SkeletonNodeOffset.WAIST } + ), + CHEST( + 4, + "Chest", + "chestDistance", + "Chest distance", + 0.32f, + new SkeletonNodeOffset[] { SkeletonNodeOffset.CHEST, SkeletonNodeOffset.WAIST, + SkeletonNodeOffset.LEFT_SHOULDER, SkeletonNodeOffset.RIGHT_SHOULDER } + ), + WAIST( + 5, + "Waist", + "waistDistance", + "Waist distance", + 0.04f, + new SkeletonNodeOffset[] { SkeletonNodeOffset.WAIST, SkeletonNodeOffset.HIP } + ), + HIP_OFFSET( + 6, + "Hip offset", + "hipOffset", + "Hip offset", + 0.0f, + new SkeletonNodeOffset[] { SkeletonNodeOffset.HIP_TRACKER } + ), + HIPS_WIDTH( + 7, + "Hips width", + "hipsWidth", + "Hips width", + 0.26f, + new SkeletonNodeOffset[] { SkeletonNodeOffset.LEFT_HIP, SkeletonNodeOffset.RIGHT_HIP } + ), + LEGS_LENGTH( + 8, + "Legs length", + "legsLength", + "Legs length", + 0.92f, + new SkeletonNodeOffset[] { SkeletonNodeOffset.KNEE } + ), + KNEE_HEIGHT( + 9, + "Knee height", + "kneeHeight", + "Knee height", + 0.50f, + new SkeletonNodeOffset[] { SkeletonNodeOffset.KNEE, SkeletonNodeOffset.ANKLE } + ), + FOOT_LENGTH( + 10, + "Foot length", + "footLength", + "Foot length", + 0.05f, + new SkeletonNodeOffset[] { SkeletonNodeOffset.FOOT } + ), + FOOT_OFFSET( + 11, + "Foot offset", + "footOffset", + "Foot offset", + -0.05f, + new SkeletonNodeOffset[] { SkeletonNodeOffset.ANKLE } + ), + SKELETON_OFFSET( + 12, + "Skeleton offset", + "skeletonOffset", + "Skeleton offset", + 0.0f, + new SkeletonNodeOffset[] { SkeletonNodeOffset.CHEST_TRACKER, SkeletonNodeOffset.HIP_TRACKER, + SkeletonNodeOffset.KNEE_TRACKER, SkeletonNodeOffset.FOOT_TRACKER } + ), + CONTROLLER_DISTANCE_Z( + 13, + "Controller distance z", + "controllerDistanceZ", + "Controller distance z", + 0.15f, + new SkeletonNodeOffset[] { SkeletonNodeOffset.CONTROLLER, SkeletonNodeOffset.HAND } + ), + CONTROLLER_DISTANCE_Y( + 14, + "Controller distance y", + "controllerDistanceY", + "Controller distance y", + 0.05f, + new SkeletonNodeOffset[] { SkeletonNodeOffset.CONTROLLER, SkeletonNodeOffset.HAND } + ), + FOREARM_LENGTH( + 15, + "Forearm length", + "forearmLength", + "Forearm length", + 0.25f, + new SkeletonNodeOffset[] { SkeletonNodeOffset.FOREARM_CONTRL, + SkeletonNodeOffset.FOREARM_HMD } + ), + SHOULDERS_DISTANCE( + 16, + "Shoulders distance", + "shoulersDistance", + "Shoulders distance", + 0.08f, + new SkeletonNodeOffset[] { SkeletonNodeOffset.LEFT_SHOULDER, + SkeletonNodeOffset.RIGHT_SHOULDER } + ), + SHOULDERS_WIDTH( + 17, + "Shoulders width", + "shoulersWidth", + "Shoulders width", + 0.36f, + new SkeletonNodeOffset[] { SkeletonNodeOffset.LEFT_SHOULDER, + SkeletonNodeOffset.RIGHT_SHOULDER } + ), + UPPER_ARM_LENGTH( + 18, + "Upper arm length", + "upperArmLength", + "Upper arm length", + 0.25f, + new SkeletonNodeOffset[] { SkeletonNodeOffset.UPPER_ARM } + ), + ELBOW_OFFSET( + 19, + "Elbow offset", + "elbowOffset", + "Elbow offset", + 0f, + new SkeletonNodeOffset[] { SkeletonNodeOffset.ELBOW_TRACKER } + ),; public static final SkeletonConfigValue[] values = values(); private static final String CONFIG_PREFIX = "body."; @@ -44,7 +182,14 @@ public enum SkeletonConfigValue { public final float defaultValue; public final SkeletonNodeOffset[] affectedOffsets; - SkeletonConfigValue(int id, String stringVal, String configKey, String label, float defaultValue, SkeletonNodeOffset[] affectedOffsets) { + SkeletonConfigValue( + int id, + String stringVal, + String configKey, + String label, + float defaultValue, + SkeletonNodeOffset[] affectedOffsets + ) { this.id = id; this.stringVal = stringVal; this.configKey = CONFIG_PREFIX + configKey; @@ -52,7 +197,8 @@ public enum SkeletonConfigValue { this.defaultValue = defaultValue; - this.affectedOffsets = affectedOffsets == null ? new SkeletonNodeOffset[0] : affectedOffsets; + this.affectedOffsets = affectedOffsets + == null ? new SkeletonNodeOffset[0] : affectedOffsets; } public static SkeletonConfigValue getByStringValue(String stringVal) { diff --git a/src/main/java/dev/slimevr/vr/processor/skeleton/SkeletonData.java b/src/main/java/dev/slimevr/vr/processor/skeleton/SkeletonData.java new file mode 100644 index 000000000..597f609b4 --- /dev/null +++ b/src/main/java/dev/slimevr/vr/processor/skeleton/SkeletonData.java @@ -0,0 +1,6 @@ +package dev.slimevr.vr.processor.skeleton; + +public class SkeletonData { + + public SkeletonConfig config; +} diff --git a/src/main/java/dev/slimevr/vr/trackers/CalibratingTracker.java b/src/main/java/dev/slimevr/vr/trackers/CalibratingTracker.java index 6ee134853..bc2f7f1b2 100644 --- a/src/main/java/dev/slimevr/vr/trackers/CalibratingTracker.java +++ b/src/main/java/dev/slimevr/vr/trackers/CalibratingTracker.java @@ -2,6 +2,7 @@ package dev.slimevr.vr.trackers; import java.util.function.Consumer; + public interface CalibratingTracker { void startCalibration(Consumer calibrationDataConsumer); diff --git a/src/main/java/dev/slimevr/vr/trackers/CircularArrayList.java b/src/main/java/dev/slimevr/vr/trackers/CircularArrayList.java index 0d851e960..ae589c23e 100644 --- a/src/main/java/dev/slimevr/vr/trackers/CircularArrayList.java +++ b/src/main/java/dev/slimevr/vr/trackers/CircularArrayList.java @@ -2,19 +2,18 @@ package dev.slimevr.vr.trackers; import java.util.*; + /** - * If you use this code, please consider notifying isak at du-preez dot com - * with a brief description of your application. + * If you use this code, please consider notifying isak at du-preez dot com with + * a brief description of your application. *

* This is free and unencumbered software released into the public domain. - * Anyone is free to copy, modify, publish, use, compile, sell, or - * distribute this software, either in source code form or as a compiled - * binary, for any purpose, commercial or non-commercial, and by any - * means. + * Anyone is free to copy, modify, publish, use, compile, sell, or distribute + * this software, either in source code form or as a compiled binary, for any + * purpose, commercial or non-commercial, and by any means. */ -public class CircularArrayList - extends AbstractList implements RandomAccess { +public class CircularArrayList extends AbstractList implements RandomAccess { private final int n; // buffer length private final List buf; // a List implementing RandomAccess @@ -73,9 +72,10 @@ public class CircularArrayList int s = size(); if (s == n - 1) { throw new IllegalStateException( - "CircularArrayList is filled to capacity. " - + "(You may want to remove from front" - + " before adding more to back.)"); + "CircularArrayList is filled to capacity. " + + "(You may want to remove from front" + + " before adding more to back.)" + ); } if (i < 0 || i > s) { throw new IndexOutOfBoundsException(); diff --git a/src/main/java/dev/slimevr/vr/trackers/ComputedTracker.java b/src/main/java/dev/slimevr/vr/trackers/ComputedTracker.java index b8d2d44fa..f90c2c5d5 100644 --- a/src/main/java/dev/slimevr/vr/trackers/ComputedTracker.java +++ b/src/main/java/dev/slimevr/vr/trackers/ComputedTracker.java @@ -2,7 +2,8 @@ package dev.slimevr.vr.trackers; import com.jme3.math.Quaternion; import com.jme3.math.Vector3f; -import dev.slimevr.vr.trackers.udp.Device; +import dev.slimevr.vr.trackers.udp.UDPDevice; + public class ComputedTracker implements Tracker, TrackerWithTPS { @@ -16,7 +17,13 @@ public class ComputedTracker implements Tracker, TrackerWithTPS { public TrackerPosition bodyPosition = null; protected TrackerStatus status = TrackerStatus.DISCONNECTED; - public ComputedTracker(int trackerId, String serial, String name, boolean hasRotation, boolean hasPosition) { + public ComputedTracker( + int trackerId, + String serial, + String name, + boolean hasRotation, + boolean hasPosition + ) { this.name = name; this.serial = serial; this.hasRotation = hasRotation; @@ -35,7 +42,9 @@ public class ComputedTracker implements Tracker, TrackerWithTPS { @Override public void loadConfig(TrackerConfig config) { - // Loading a config is an act of user editing, therefore it shouldn't not be allowed if editing is not allowed + // Loading a config is an act of user editing, therefore it shouldn't + // not be + // allowed if editing is not allowed if (userEditable()) { bodyPosition = TrackerPosition.getByDesignation(config.designation); } @@ -139,7 +148,7 @@ public class ComputedTracker implements Tracker, TrackerWithTPS { } @Override - public Device getDevice() { + public UDPDevice getDevice() { return null; } } diff --git a/src/main/java/dev/slimevr/vr/trackers/Device.java b/src/main/java/dev/slimevr/vr/trackers/Device.java new file mode 100644 index 000000000..d9fa82540 --- /dev/null +++ b/src/main/java/dev/slimevr/vr/trackers/Device.java @@ -0,0 +1,10 @@ +package dev.slimevr.vr.trackers; + +import java.util.concurrent.atomic.AtomicInteger; + +public interface Device { + + public static final AtomicInteger nextLocalDeviceId = new AtomicInteger(); + + int getId(); +} diff --git a/src/main/java/dev/slimevr/vr/trackers/DeviceType.java b/src/main/java/dev/slimevr/vr/trackers/DeviceType.java index a04142364..4967cc9ad 100644 --- a/src/main/java/dev/slimevr/vr/trackers/DeviceType.java +++ b/src/main/java/dev/slimevr/vr/trackers/DeviceType.java @@ -1,8 +1,5 @@ package dev.slimevr.vr.trackers; public enum DeviceType { - HMD, - CONTROLLER, - TRACKER, - TRACKING_REFERENCE, + HMD, CONTROLLER, TRACKER, TRACKING_REFERENCE } diff --git a/src/main/java/dev/slimevr/vr/trackers/HMDTracker.java b/src/main/java/dev/slimevr/vr/trackers/HMDTracker.java index 3a3108575..dd0bae79e 100644 --- a/src/main/java/dev/slimevr/vr/trackers/HMDTracker.java +++ b/src/main/java/dev/slimevr/vr/trackers/HMDTracker.java @@ -2,6 +2,7 @@ package dev.slimevr.vr.trackers; import io.eiren.util.BufferedTimer; + public class HMDTracker extends ComputedTracker implements TrackerWithTPS { protected BufferedTimer timer = new BufferedTimer(1f); diff --git a/src/main/java/dev/slimevr/vr/trackers/IMUTracker.java b/src/main/java/dev/slimevr/vr/trackers/IMUTracker.java index 1b9f64e3f..10246a607 100644 --- a/src/main/java/dev/slimevr/vr/trackers/IMUTracker.java +++ b/src/main/java/dev/slimevr/vr/trackers/IMUTracker.java @@ -4,21 +4,22 @@ import com.jme3.math.FastMath; import com.jme3.math.Quaternion; import com.jme3.math.Vector3f; import dev.slimevr.VRServer; -import dev.slimevr.vr.trackers.udp.Device; +import dev.slimevr.vr.trackers.udp.UDPDevice; import dev.slimevr.vr.trackers.udp.TrackersUDPServer; import io.eiren.util.BufferedTimer; + public class IMUTracker implements Tracker, TrackerWithTPS, TrackerWithBattery { public static final float MAX_MAG_CORRECTION_ACCURACY = 5 * FastMath.RAD_TO_DEG; - //public final Vector3f gyroVector = new Vector3f(); - //public final Vector3f accelVector = new Vector3f(); + // public final Vector3f gyroVector = new Vector3f(); + // public final Vector3f accelVector = new Vector3f(); public final Vector3f magVector = new Vector3f(); public final Quaternion rotQuaternion = new Quaternion(); public final Quaternion rotMagQuaternion = new Quaternion(); public final Quaternion rotAdjust = new Quaternion(); - public final Device device; + public final UDPDevice device; public final int trackerNum; protected final Quaternion correction = new Quaternion(); protected final int trackerId; @@ -46,7 +47,15 @@ public class IMUTracker implements Tracker, TrackerWithTPS, TrackerWithBattery { protected boolean magentometerCalibrated = false; protected BufferedTimer timer = new BufferedTimer(1f); - public IMUTracker(Device device, int trackerId, int trackerNum, String name, String descriptiveName, TrackersUDPServer server, VRServer vrserver) { + public IMUTracker( + UDPDevice device, + int trackerId, + int trackerNum, + String name, + String descriptiveName, + TrackersUDPServer server, + VRServer vrserver + ) { this.device = device; this.trackerNum = trackerNum; this.name = name; @@ -64,7 +73,9 @@ public class IMUTracker implements Tracker, TrackerWithTPS, TrackerWithBattery { @Override public void loadConfig(TrackerConfig config) { - // Loading a config is an act of user editing, therefore it shouldn't not be allowed if editing is not allowed + // Loading a config is an act of user editing, therefore it shouldn't + // not be + // allowed if editing is not allowed if (userEditable()) { if (config.mountingRotation != null) { mounting = config.mountingRotation; @@ -73,7 +84,11 @@ public class IMUTracker implements Tracker, TrackerWithTPS, TrackerWithBattery { rotAdjust.loadIdentity(); } bodyPosition = TrackerPosition.getByDesignation(config.designation); - setFilter(vrserver.config.getString("filters.type"), vrserver.config.getFloat("filters.amount", 0.3f), vrserver.config.getInt("filters.tickCount", 1)); + setFilter( + vrserver.config.getString("filters.type"), + vrserver.config.getFloat("filters.amount", 0.3f), + vrserver.config.getInt("filters.tickCount", 1) + ); } } @@ -121,7 +136,8 @@ public class IMUTracker implements Tracker, TrackerWithTPS, TrackerWithBattery { if (magentometerCalibrated && hasNewCorrectionData) { hasNewCorrectionData = false; if (magnetometerAccuracy <= MAX_MAG_CORRECTION_ACCURACY) { - // Adjust gyro rotation to match magnetometer rotation only if magnetometer + // Adjust gyro rotation to match magnetometer rotation only if + // magnetometer // accuracy is within the parameters calculateLiveMagnetometerCorrection(); } @@ -148,7 +164,9 @@ public class IMUTracker implements Tracker, TrackerWithTPS, TrackerWithBattery { } else { store.set(rotQuaternion); } - //correction.mult(store, store); // Correction is not used now to prevent accidental errors while debugging other things + // correction.mult(store, store); // Correction is not used now to + // prevent + // accidental errors while debugging other things store.multLocal(rotAdjust); return true; } @@ -217,22 +235,23 @@ public class IMUTracker implements Tracker, TrackerWithTPS, TrackerWithBattery { /** * Does not perform actual gyro reset to reference, that's the task of - * reference adjusted tracker. Only aligns gyro with magnetometer if - * it's reliable + * reference adjusted tracker. Only aligns gyro with magnetometer if it's + * reliable */ @Override public void resetYaw(Quaternion reference) { if (magCalibrationStatus >= CalibrationAccuracy.HIGH.status) { magentometerCalibrated = true; - // During calibration set correction to match magnetometer readings exactly + // During calibration set correction to match magnetometer readings + // exactly // TODO : Correct only yaw correction.set(rotQuaternion).inverseLocal().multLocal(rotMagQuaternion); } } /** - * Calculate correction between normal and magnetometer - * readings up to accuracy threshold + * Calculate correction between normal and magnetometer readings up to + * accuracy threshold */ protected void calculateLiveMagnetometerCorrection() { // TODO Magic, correct only yaw @@ -280,7 +299,7 @@ public class IMUTracker implements Tracker, TrackerWithTPS, TrackerWithBattery { } @Override - public Device getDevice() { + public UDPDevice getDevice() { return this.device; } @@ -291,11 +310,7 @@ public class IMUTracker implements Tracker, TrackerWithTPS, TrackerWithBattery { public enum CalibrationAccuracy { - UNRELIABLE(0), - LOW(1), - MEDIUM(2), - HIGH(3), - ; + UNRELIABLE(0), LOW(1), MEDIUM(2), HIGH(3),; private static final CalibrationAccuracy[] byStatus = new CalibrationAccuracy[4]; diff --git a/src/main/java/dev/slimevr/vr/trackers/MPUTracker.java b/src/main/java/dev/slimevr/vr/trackers/MPUTracker.java index 317968496..8b1b0dedb 100644 --- a/src/main/java/dev/slimevr/vr/trackers/MPUTracker.java +++ b/src/main/java/dev/slimevr/vr/trackers/MPUTracker.java @@ -1,33 +1,48 @@ package dev.slimevr.vr.trackers; import dev.slimevr.VRServer; -import dev.slimevr.vr.trackers.udp.Device; +import dev.slimevr.vr.trackers.udp.UDPDevice; import dev.slimevr.vr.trackers.udp.TrackersUDPServer; import java.nio.ByteBuffer; + public class MPUTracker extends IMUTracker { public ConfigurationData newCalibrationData; - public MPUTracker(Device device, int trackerId, int trackerNum, String name, String descriptiveName, TrackersUDPServer server, VRServer vrserver) { + public MPUTracker( + UDPDevice device, + int trackerId, + int trackerNum, + String name, + String descriptiveName, + TrackersUDPServer server, + VRServer vrserver + ) { super(device, trackerId, trackerNum, name, descriptiveName, server, vrserver); } public static class ConfigurationData { - //accel offsets and correction matrix + // accel offsets and correction matrix float[] A_B = new float[3]; float[][] A_Ainv = new float[3][3]; // mag offsets and correction matrix float[] M_B = new float[3]; float[][] M_Ainv = new float[3][3]; - //raw offsets, determined for gyro at rest + // raw offsets, determined for gyro at rest float[] G_off = new float[3]; int deviceId = -1; int deviceMode = -1; - public ConfigurationData(double[] accelBasis, double[] accelAInv, double[] magBasis, double[] magAInv, double[] gyroOffset) { + public ConfigurationData( + double[] accelBasis, + double[] accelAInv, + double[] magBasis, + double[] magAInv, + double[] gyroOffset + ) { A_B[0] = (float) accelBasis[0]; A_B[1] = (float) accelBasis[1]; A_B[2] = (float) accelBasis[2]; @@ -101,13 +116,47 @@ public class MPUTracker extends IMUTracker { public String toTextMatrix() { StringBuilder sb = new StringBuilder(); sb.append(String.format("{%8.2f,%8.2f,%8.2f},\n", A_B[0], A_B[1], A_B[2])); - sb.append(String.format("{{%9.5f,%9.5f,%9.5f},\n", A_Ainv[0][0], A_Ainv[0][1], A_Ainv[0][2])); - sb.append(String.format(" {%9.5f,%9.5f,%9.5f},\n", A_Ainv[1][0], A_Ainv[1][1], A_Ainv[1][2])); - sb.append(String.format(" {%9.5f,%9.5f,%9.5f}},\n", A_Ainv[2][0], A_Ainv[2][1], A_Ainv[2][2])); + sb + .append( + String + .format("{{%9.5f,%9.5f,%9.5f},\n", A_Ainv[0][0], A_Ainv[0][1], A_Ainv[0][2]) + ); + sb + .append( + String + .format(" {%9.5f,%9.5f,%9.5f},\n", A_Ainv[1][0], A_Ainv[1][1], A_Ainv[1][2]) + ); + sb + .append( + String + .format( + " {%9.5f,%9.5f,%9.5f}},\n", + A_Ainv[2][0], + A_Ainv[2][1], + A_Ainv[2][2] + ) + ); sb.append(String.format("{%8.2f,%8.2f,%8.2f},\n", M_B[0], M_B[1], M_B[2])); - sb.append(String.format("{{%9.5f,%9.5f,%9.5f},\n", M_Ainv[0][0], M_Ainv[0][1], M_Ainv[0][2])); - sb.append(String.format(" {%9.5f,%9.5f,%9.5f},\n", M_Ainv[1][0], M_Ainv[1][1], M_Ainv[1][2])); - sb.append(String.format(" {%9.5f,%9.5f,%9.5f}},\n", M_Ainv[2][0], M_Ainv[2][1], M_Ainv[2][2])); + sb + .append( + String + .format("{{%9.5f,%9.5f,%9.5f},\n", M_Ainv[0][0], M_Ainv[0][1], M_Ainv[0][2]) + ); + sb + .append( + String + .format(" {%9.5f,%9.5f,%9.5f},\n", M_Ainv[1][0], M_Ainv[1][1], M_Ainv[1][2]) + ); + sb + .append( + String + .format( + " {%9.5f,%9.5f,%9.5f}},\n", + M_Ainv[2][0], + M_Ainv[2][1], + M_Ainv[2][2] + ) + ); sb.append(String.format("{%8.2f, %8.2f, %8.2f}};\n", G_off[0], G_off[1], G_off[2])); return sb.toString(); diff --git a/src/main/java/dev/slimevr/vr/trackers/ReferenceAdjustedTracker.java b/src/main/java/dev/slimevr/vr/trackers/ReferenceAdjustedTracker.java index f46536f73..0de725366 100644 --- a/src/main/java/dev/slimevr/vr/trackers/ReferenceAdjustedTracker.java +++ b/src/main/java/dev/slimevr/vr/trackers/ReferenceAdjustedTracker.java @@ -2,7 +2,8 @@ package dev.slimevr.vr.trackers; import com.jme3.math.Quaternion; import com.jme3.math.Vector3f; -import dev.slimevr.vr.trackers.udp.Device; +import dev.slimevr.vr.trackers.udp.UDPDevice; + public class ReferenceAdjustedTracker implements Tracker { @@ -36,11 +37,11 @@ public class ReferenceAdjustedTracker implements Tracker { } /** - * Reset the tracker so that it's current rotation - * is counted as (0, , 0). This allows tracker - * to be strapped to body at any pitch and roll. - *

Performs {@link #resetYaw(Quaternion)} for yaw - * drift correction. + * Reset the tracker so that it's current rotation is counted as (0, , 0). This allows tracker to be strapped to body at any pitch and + * roll. + *

+ * Performs {@link #resetYaw(Quaternion)} for yaw drift correction. */ @Override public void resetFull(Quaternion reference) { @@ -56,11 +57,10 @@ public class ReferenceAdjustedTracker implements Tracker { } /** - * Reset the tracker so that it's current yaw rotation - * is counted as . This allows the tracker - * to have yaw independent of the HMD. Tracker should - * still report yaw as if it was mounted facing HMD, - * mounting position should be corrected in the source. + * Reset the tracker so that it's current yaw rotation is counted as . This allows the tracker to have yaw independent of the HMD. Tracker + * should still report yaw as if it was mounted facing HMD, mounting + * position should be corrected in the source. */ @Override public void resetYaw(Quaternion reference) { @@ -177,7 +177,7 @@ public class ReferenceAdjustedTracker implements Tracker { } @Override - public Device getDevice() { + public UDPDevice getDevice() { return tracker.getDevice(); } } diff --git a/src/main/java/dev/slimevr/vr/trackers/SensorTap.java b/src/main/java/dev/slimevr/vr/trackers/SensorTap.java index 2ffd6650b..464bf5efe 100644 --- a/src/main/java/dev/slimevr/vr/trackers/SensorTap.java +++ b/src/main/java/dev/slimevr/vr/trackers/SensorTap.java @@ -14,8 +14,6 @@ public class SensorTap { } public enum TapAxis { - X, - Y, - Z + X, Y, Z } } diff --git a/src/main/java/dev/slimevr/vr/trackers/Tracker.java b/src/main/java/dev/slimevr/vr/trackers/Tracker.java index 516c53c83..4c2b358e0 100644 --- a/src/main/java/dev/slimevr/vr/trackers/Tracker.java +++ b/src/main/java/dev/slimevr/vr/trackers/Tracker.java @@ -2,10 +2,11 @@ package dev.slimevr.vr.trackers; import com.jme3.math.Quaternion; import com.jme3.math.Vector3f; -import dev.slimevr.vr.trackers.udp.Device; +import dev.slimevr.vr.trackers.udp.UDPDevice; import java.util.concurrent.atomic.AtomicInteger; + public interface Tracker { AtomicInteger nextLocalTrackerId = new AtomicInteger(); @@ -50,7 +51,7 @@ public interface Tracker { int getTrackerNum(); - Device getDevice(); + UDPDevice getDevice(); default String getDescriptiveName() { return getName(); diff --git a/src/main/java/dev/slimevr/vr/trackers/TrackerConfig.java b/src/main/java/dev/slimevr/vr/trackers/TrackerConfig.java index 186146bb0..80f948494 100644 --- a/src/main/java/dev/slimevr/vr/trackers/TrackerConfig.java +++ b/src/main/java/dev/slimevr/vr/trackers/TrackerConfig.java @@ -5,6 +5,7 @@ import io.eiren.yaml.YamlNode; import java.util.Objects; + public class TrackerConfig { public final String trackerName; @@ -18,7 +19,8 @@ public class TrackerConfig { public TrackerConfig(Tracker tracker) { this.trackerName = tracker.getName(); this.description = tracker.getDescriptiveName(); - this.designation = tracker.getBodyPosition() != null ? tracker.getBodyPosition().designation : null; + this.designation = tracker.getBodyPosition() + != null ? tracker.getBodyPosition().designation : null; } public TrackerConfig(YamlNode node) { @@ -30,25 +32,26 @@ public class TrackerConfig { YamlNode mountingRotationNode = node.getNode("mountingRotation"); if (mountingRotationNode != null) { mountingRotation = new Quaternion( - mountingRotationNode.getFloat("x", 0), - mountingRotationNode.getFloat("y", 0), - mountingRotationNode.getFloat("z", 0), - mountingRotationNode.getFloat("w", 1) + mountingRotationNode.getFloat("x", 0), + mountingRotationNode.getFloat("y", 0), + mountingRotationNode.getFloat("z", 0), + mountingRotationNode.getFloat("w", 1) ); } if (oldMountingRotation != null) { TrackerMountingRotation rot = TrackerMountingRotation.fromName(oldMountingRotation); - mountingRotation = Objects.requireNonNullElse(rot, TrackerMountingRotation.FRONT).quaternion; + mountingRotation = Objects + .requireNonNullElse(rot, TrackerMountingRotation.FRONT).quaternion; } YamlNode adjNode = node.getNode("adjustment"); if (adjNode != null) { adjustment = new Quaternion( - adjNode.getFloat("x", 0), - adjNode.getFloat("y", 0), - adjNode.getFloat("z", 0), - adjNode.getFloat("w", 0) + adjNode.getFloat("x", 0), + adjNode.getFloat("y", 0), + adjNode.getFloat("z", 0), + adjNode.getFloat("w", 0) ); } } diff --git a/src/main/java/dev/slimevr/vr/trackers/TrackerFilters.java b/src/main/java/dev/slimevr/vr/trackers/TrackerFilters.java index 9bd8c605a..672cbe98e 100644 --- a/src/main/java/dev/slimevr/vr/trackers/TrackerFilters.java +++ b/src/main/java/dev/slimevr/vr/trackers/TrackerFilters.java @@ -1,10 +1,13 @@ package dev.slimevr.vr.trackers; public enum TrackerFilters { + NONE(0), INTERPOLATION(1), EXTRAPOLATION(2); + public static final TrackerFilters[] values = values(); + public final int id; TrackerFilters(int id) { @@ -12,7 +15,7 @@ public enum TrackerFilters { } public static TrackerFilters fromId(int id) { - for (TrackerFilters filter : values()) { + for (TrackerFilters filter : values) { if (filter.id == id) return filter; } diff --git a/src/main/java/dev/slimevr/vr/trackers/TrackerMountingRotation.java b/src/main/java/dev/slimevr/vr/trackers/TrackerMountingRotation.java index 35ec78882..6e762542a 100644 --- a/src/main/java/dev/slimevr/vr/trackers/TrackerMountingRotation.java +++ b/src/main/java/dev/slimevr/vr/trackers/TrackerMountingRotation.java @@ -3,12 +3,10 @@ package dev.slimevr.vr.trackers; import com.jme3.math.FastMath; import com.jme3.math.Quaternion; + public enum TrackerMountingRotation { - FRONT(180), - LEFT(90), - BACK(0), - RIGHT(-90); + FRONT(180), LEFT(90), BACK(0), RIGHT(-90); public static final TrackerMountingRotation[] values = values(); public final Quaternion quaternion; diff --git a/src/main/java/dev/slimevr/vr/trackers/TrackerPosition.java b/src/main/java/dev/slimevr/vr/trackers/TrackerPosition.java index b876d36f4..e70f771e6 100644 --- a/src/main/java/dev/slimevr/vr/trackers/TrackerPosition.java +++ b/src/main/java/dev/slimevr/vr/trackers/TrackerPosition.java @@ -4,6 +4,7 @@ import java.util.EnumMap; import java.util.HashMap; import java.util.Map; + public enum TrackerPosition { NONE(0, "", TrackerRole.NONE), @@ -25,13 +26,14 @@ public enum TrackerPosition { LEFT_UPPER_ARM(16, "body:left_upperarm", null), RIGHT_UPPER_ARM(17, "body:right_upperarm", null), LEFT_HAND(18, "body:left_hand", TrackerRole.LEFT_HAND), - RIGHT_HAND(19, "body:right_hand", TrackerRole.RIGHT_HAND), - ; + RIGHT_HAND(19, "body:right_hand", TrackerRole.RIGHT_HAND),; public static final TrackerPosition[] values = values(); private static final Map byId = new HashMap<>(); private static final Map byDesignation = new HashMap<>(); - private static final EnumMap byRole = new EnumMap<>(TrackerRole.class); + private static final EnumMap byRole = new EnumMap<>( + TrackerRole.class + ); static { for (TrackerPosition tbp : values()) { @@ -40,7 +42,14 @@ public enum TrackerPosition { if (tbp.trackerRole != null) { TrackerPosition old = byRole.get(tbp.trackerRole); if (old != null) - throw new AssertionError("Only one tracker position can match tracker role. " + tbp.trackerRole + " is occupied by " + old + " when adding " + tbp); + throw new AssertionError( + "Only one tracker position can match tracker role. " + + tbp.trackerRole + + " is occupied by " + + old + + " when adding " + + tbp + ); byRole.put(tbp.trackerRole, tbp); } } diff --git a/src/main/java/dev/slimevr/vr/trackers/TrackerRole.java b/src/main/java/dev/slimevr/vr/trackers/TrackerRole.java index 5b232d4af..463e5f0a0 100644 --- a/src/main/java/dev/slimevr/vr/trackers/TrackerRole.java +++ b/src/main/java/dev/slimevr/vr/trackers/TrackerRole.java @@ -12,7 +12,12 @@ public enum TrackerRole { LEFT_ELBOW(7, "vive_tracker_left_elbow", "TrackerRole_LeftElbow", DeviceType.TRACKER), RIGHT_ELBOW(8, "vive_tracker_right_elbow", "TrackerRole_RightElbow", DeviceType.TRACKER), LEFT_SHOULDER(9, "vive_tracker_left_shoulder", "TrackerRole_LeftShoulder", DeviceType.TRACKER), - RIGHT_SHOULDER(10, "vive_tracker_right_shoulder", "TrackerRole_RightShoulder", DeviceType.TRACKER), + RIGHT_SHOULDER( + 10, + "vive_tracker_right_shoulder", + "TrackerRole_RightShoulder", + DeviceType.TRACKER + ), LEFT_HAND(11, "vive_tracker_handed", "TrackerRole_Handed", DeviceType.TRACKER), RIGHT_HAND(12, "vive_tracker_handed", "TrackerRole_Handed", DeviceType.TRACKER), LEFT_CONTROLLER(13, "vive_tracker_handed", "TrackerRole_Handed", DeviceType.CONTROLLER), @@ -23,8 +28,7 @@ public enum TrackerRole { KEYBOARD(18, "vive_tracker_keyboard", "TrackerRole_Keyboard", DeviceType.TRACKER), HMD(19, "", "", DeviceType.HMD), BEACON(20, "", "", DeviceType.TRACKING_REFERENCE), - GENERIC_CONTROLLER(21, "vive_tracker_handed", "TrackerRole_Handed", DeviceType.CONTROLLER), - ; + GENERIC_CONTROLLER(21, "vive_tracker_handed", "TrackerRole_Handed", DeviceType.CONTROLLER); public static final TrackerRole[] values = values(); private static final TrackerRole[] byId = new TrackerRole[22]; @@ -32,7 +36,14 @@ public enum TrackerRole { static { for (TrackerRole tr : values) { if (byId[tr.id] != null) - throw new AssertionError("Tracker role id " + tr.id + " occupied by " + byId[tr.id] + " when adding " + tr); + throw new AssertionError( + "Tracker role id " + + tr.id + + " occupied by " + + byId[tr.id] + + " when adding " + + tr + ); byId[tr.id] = tr; } } diff --git a/src/main/java/dev/slimevr/vr/trackers/TrackerStatus.java b/src/main/java/dev/slimevr/vr/trackers/TrackerStatus.java index 0b06e12ad..6f9aa51ff 100644 --- a/src/main/java/dev/slimevr/vr/trackers/TrackerStatus.java +++ b/src/main/java/dev/slimevr/vr/trackers/TrackerStatus.java @@ -6,8 +6,7 @@ public enum TrackerStatus { OK(1, true), BUSY(2, true), ERROR(3, false), - OCCLUDED(4, false), - ; + OCCLUDED(4, false); private static final TrackerStatus[] byId = new TrackerStatus[5]; diff --git a/src/main/java/dev/slimevr/vr/trackers/TrackerUtils.java b/src/main/java/dev/slimevr/vr/trackers/TrackerUtils.java index 7f9ee779c..86c984361 100644 --- a/src/main/java/dev/slimevr/vr/trackers/TrackerUtils.java +++ b/src/main/java/dev/slimevr/vr/trackers/TrackerUtils.java @@ -2,12 +2,16 @@ package dev.slimevr.vr.trackers; import java.util.List; + public class TrackerUtils { private TrackerUtils() { } - public static T findTrackerForBodyPosition(T[] allTrackers, TrackerPosition position) { + public static T findTrackerForBodyPosition( + T[] allTrackers, + TrackerPosition position + ) { if (position == null) return null; for (int i = 0; i < allTrackers.length; ++i) { @@ -18,7 +22,10 @@ public class TrackerUtils { return null; } - public static T findTrackerForBodyPosition(List allTrackers, TrackerPosition position) { + public static T findTrackerForBodyPosition( + List allTrackers, + TrackerPosition position + ) { if (position == null) return null; for (T t : allTrackers) { @@ -28,14 +35,23 @@ public class TrackerUtils { return null; } - public static T findTrackerForBodyPosition(List allTrackers, TrackerPosition position, TrackerPosition altPosition) { + public static T findTrackerForBodyPosition( + List allTrackers, + TrackerPosition position, + TrackerPosition altPosition + ) { T t = findTrackerForBodyPosition(allTrackers, position); if (t != null) return t; return findTrackerForBodyPosition(allTrackers, altPosition); } - public static T findTrackerForBodyPosition(T[] allTrackers, TrackerPosition position, TrackerPosition altPosition, TrackerPosition secondAltPosition) { + public static T findTrackerForBodyPosition( + T[] allTrackers, + TrackerPosition position, + TrackerPosition altPosition, + TrackerPosition secondAltPosition + ) { T t = findTrackerForBodyPosition(allTrackers, position); if (t != null) return t; @@ -45,7 +61,12 @@ public class TrackerUtils { return findTrackerForBodyPosition(allTrackers, secondAltPosition); } - public static Tracker findTrackerForBodyPositionOrEmpty(List allTrackers, TrackerPosition position, TrackerPosition altPosition, TrackerPosition secondAltPosition) { + public static Tracker findTrackerForBodyPositionOrEmpty( + List allTrackers, + TrackerPosition position, + TrackerPosition altPosition, + TrackerPosition secondAltPosition + ) { Tracker t = findTrackerForBodyPosition(allTrackers, position); if (t != null) return t; @@ -58,7 +79,11 @@ public class TrackerUtils { return new ComputedTracker(Tracker.getNextLocalTrackerId(), "Empty tracker", false, false); } - public static Tracker findTrackerForBodyPositionOrEmpty(Tracker[] allTrackers, TrackerPosition position, TrackerPosition altPosition) { + public static Tracker findTrackerForBodyPositionOrEmpty( + Tracker[] allTrackers, + TrackerPosition position, + TrackerPosition altPosition + ) { Tracker t = findTrackerForBodyPosition(allTrackers, position); if (t != null) return t; diff --git a/src/main/java/dev/slimevr/vr/trackers/VRTracker.java b/src/main/java/dev/slimevr/vr/trackers/VRTracker.java index 2e2379389..29a4062b7 100644 --- a/src/main/java/dev/slimevr/vr/trackers/VRTracker.java +++ b/src/main/java/dev/slimevr/vr/trackers/VRTracker.java @@ -2,6 +2,7 @@ package dev.slimevr.vr.trackers; import io.eiren.util.BufferedTimer; + public class VRTracker extends ComputedTracker { protected BufferedTimer timer = new BufferedTimer(1f); diff --git a/src/main/java/dev/slimevr/vr/trackers/udp/TrackersUDPServer.java b/src/main/java/dev/slimevr/vr/trackers/udp/TrackersUDPServer.java index 57b7760ae..2cb2abbec 100644 --- a/src/main/java/dev/slimevr/vr/trackers/udp/TrackersUDPServer.java +++ b/src/main/java/dev/slimevr/vr/trackers/udp/TrackersUDPServer.java @@ -21,6 +21,7 @@ import java.nio.ByteOrder; import java.util.*; import java.util.function.Consumer; + /** * Receives trackers data by UDP using extended owoTrack protocol. */ @@ -29,13 +30,14 @@ public class TrackersUDPServer extends Thread { /** * Change between IMU axes and OpenGL/SteamVR axes */ - private static final Quaternion offset = new Quaternion().fromAngleAxis(-FastMath.HALF_PI, Vector3f.UNIT_X); + private static final Quaternion offset = new Quaternion() + .fromAngleAxis(-FastMath.HALF_PI, Vector3f.UNIT_X); private final Quaternion buf = new Quaternion(); private final Random random = new Random(); - private final List connections = new FastList<>(); - private final Map connectionsByAddress = new HashMap<>(); - private final Map connectionsByMAC = new HashMap<>(); + private final List connections = new FastList<>(); + private final Map connectionsByAddress = new HashMap<>(); + private final Map connectionsByMAC = new HashMap<>(); private final Consumer trackersConsumer; private final int port; private final ArrayList broadcastAddresses = new ArrayList<>(); @@ -55,7 +57,12 @@ public class TrackersUDPServer extends Thread { while (ifaces.hasMoreElements()) { NetworkInterface iface = ifaces.nextElement(); // Ignore loopback, PPP, virtual and disabled devices - if (iface.isLoopback() || !iface.isUp() || iface.isPointToPoint() || iface.isVirtual()) { + if ( + iface.isLoopback() + || !iface.isUp() + || iface.isPointToPoint() + || iface.isVirtual() + ) { continue; } Enumeration iaddrs = iface.getInetAddresses(); @@ -66,11 +73,23 @@ public class TrackersUDPServer extends Thread { continue; } String[] iaddrParts = iaddr.getHostAddress().split("\\."); - broadcastAddresses.add(new InetSocketAddress(String.format("%s.%s.%s.255", iaddrParts[0], iaddrParts[1], iaddrParts[2]), port)); + broadcastAddresses + .add( + new InetSocketAddress( + String + .format( + "%s.%s.%s.255", + iaddrParts[0], + iaddrParts[1], + iaddrParts[2] + ), + port + ) + ); } } } catch (Exception e) { - LogManager.log.severe("[TrackerServer] Can't enumerate network interfaces", e); + LogManager.severe("[TrackerServer] Can't enumerate network interfaces", e); } } @@ -87,28 +106,42 @@ public class TrackersUDPServer extends Thread { return sb.toString(); } - private void setUpNewConnection(DatagramPacket handshakePacket, UDPPacket3Handshake handshake) throws IOException { - LogManager.log.info("[TrackerServer] Handshake received from " + handshakePacket.getAddress() + ":" + handshakePacket.getPort()); + private void setUpNewConnection(DatagramPacket handshakePacket, UDPPacket3Handshake handshake) + throws IOException { + LogManager + .info( + "[TrackerServer] Handshake received from " + + handshakePacket.getAddress() + + ":" + + handshakePacket.getPort() + ); InetAddress addr = handshakePacket.getAddress(); - Device connection; + UDPDevice connection; synchronized (connections) { connection = connectionsByAddress.get(addr); } if (connection == null) { - connection = new Device(handshakePacket.getSocketAddress(), addr); + connection = new UDPDevice(handshakePacket.getSocketAddress(), addr); connection.firmwareBuild = handshake.firmwareBuild; if (handshake.firmware == null || handshake.firmware.length() == 0) { - // Only old owoTrack doesn't report firmware and have different packet IDs with SlimeVR + // Only old owoTrack doesn't report firmware and have different + // packet IDs with + // SlimeVR connection.protocol = NetworkProtocol.OWO_LEGACY; } else { connection.protocol = NetworkProtocol.SLIMEVR_RAW; } - connection.name = handshake.macString != null ? "udp://" + handshake.macString : "udp:/" + handshakePacket.getAddress().toString(); + connection.name = handshake.macString != null + ? "udp://" + handshake.macString + : "udp:/" + + handshakePacket.getAddress().toString(); connection.descriptiveName = "udp:/" + handshakePacket.getAddress().toString(); int i = 0; synchronized (connections) { - if (handshake.macString != null && connectionsByMAC.containsKey(handshake.macString)) { - Device previousConnection = connectionsByMAC.get(handshake.macString); + if ( + handshake.macString != null && connectionsByMAC.containsKey(handshake.macString) + ) { + UDPDevice previousConnection = connectionsByMAC.get(handshake.macString); i = connections.indexOf(previousConnection); connectionsByAddress.remove(previousConnection.ipAddress); previousConnection.lastPacketNumber = 0; @@ -117,7 +150,25 @@ public class TrackersUDPServer extends Thread { previousConnection.name = connection.name; previousConnection.descriptiveName = connection.descriptiveName; connectionsByAddress.put(addr, previousConnection); - LogManager.log.info("[TrackerServer] Tracker " + i + " handed over to address " + handshakePacket.getSocketAddress() + ". Board type: " + handshake.boardType + ", imu type: " + handshake.imuType + ", firmware: " + handshake.firmware + " (" + connection.firmwareBuild + "), mac: " + handshake.macString + ", name: " + previousConnection.name); + LogManager + .info( + "[TrackerServer] Tracker " + + i + + " handed over to address " + + handshakePacket.getSocketAddress() + + ". Board type: " + + handshake.boardType + + ", imu type: " + + handshake.imuType + + ", firmware: " + + handshake.firmware + + " (" + + connection.firmwareBuild + + "), mac: " + + handshake.macString + + ", name: " + + previousConnection.name + ); } else { i = connections.size(); connections.add(connection); @@ -125,12 +176,32 @@ public class TrackersUDPServer extends Thread { if (handshake.macString != null) { connectionsByMAC.put(handshake.macString, connection); } - LogManager.log.info("[TrackerServer] Tracker " + i + " added with address " + handshakePacket.getSocketAddress() + ". Board type: " + handshake.boardType + ", imu type: " + handshake.imuType + ", firmware: " + handshake.firmware + " (" + connection.firmwareBuild + "), mac: " + handshake.macString + ", name: " + connection.name); + LogManager + .info( + "[TrackerServer] Tracker " + + i + + " added with address " + + handshakePacket.getSocketAddress() + + ". Board type: " + + handshake.boardType + + ", imu type: " + + handshake.imuType + + ", firmware: " + + handshake.firmware + + " (" + + connection.firmwareBuild + + "), mac: " + + handshake.macString + + ", name: " + + connection.name + ); } } if (connection.protocol == NetworkProtocol.OWO_LEGACY || connection.firmwareBuild < 9) { // Set up new sensor for older firmware - // Firmware after 7 should send sensor status packet and sensor will be created when it's received + // Firmware after 7 should send sensor status packet and sensor + // will be created + // when it's received setUpSensor(connection, 0, handshake.imuType, 1); } } @@ -140,15 +211,42 @@ public class TrackersUDPServer extends Thread { socket.send(new DatagramPacket(rcvBuffer, bb.position(), connection.address)); } - private void setUpSensor(Device connection, int trackerId, int sensorType, int sensorStatus) throws IOException { - LogManager.log.info("[TrackerServer] Sensor " + trackerId + " for " + connection.name + " status: " + sensorStatus); + private void setUpSensor(UDPDevice connection, int trackerId, int sensorType, int sensorStatus) + throws IOException { + LogManager + .info( + "[TrackerServer] Sensor " + + trackerId + + " for " + + connection.name + + " status: " + + sensorStatus + ); IMUTracker imu = connection.sensors.get(trackerId); if (imu == null) { - imu = new IMUTracker(connection, Tracker.getNextLocalTrackerId(), trackerId, connection.name + "/" + trackerId, connection.descriptiveName + "/" + trackerId, this, Main.vrServer); + imu = new IMUTracker( + connection, + Tracker.getNextLocalTrackerId(), + trackerId, + connection.name + "/" + trackerId, + connection.descriptiveName + "/" + trackerId, + this, + Main.vrServer + ); connection.sensors.put(trackerId, imu); - ReferenceAdjustedTracker adjustedTracker = new ReferenceAdjustedTracker<>(imu); + ReferenceAdjustedTracker adjustedTracker = new ReferenceAdjustedTracker<>( + imu + ); trackersConsumer.accept(adjustedTracker); - LogManager.log.info("[TrackerServer] Added sensor " + trackerId + " for " + connection.name + ", type " + sensorType); + LogManager + .info( + "[TrackerServer] Added sensor " + + trackerId + + " for " + + connection.name + + ", type " + + sensorType + ); } TrackerStatus status = UDPPacket15SensorInfo.getStatus(sensorStatus); if (status != null) @@ -167,7 +265,7 @@ public class TrackersUDPServer extends Thread { DatagramPacket received = null; try { boolean hasActiveTrackers = false; - for (Device tracker : connections) { + for (UDPDevice tracker : connections) { if (tracker.sensors.size() > 0) { hasActiveTrackers = true; break; @@ -191,7 +289,7 @@ public class TrackersUDPServer extends Thread { bb.limit(received.getLength()); bb.rewind(); - Device connection; + UDPDevice connection; synchronized (connections) { connection = connectionsByAddress.get(received.getAddress()); @@ -200,14 +298,17 @@ public class TrackersUDPServer extends Thread { if (packet != null) { processPacket(received, packet, connection); } - } catch (SocketTimeoutException e) { - } catch (Exception e) { - LogManager.log.warning("[TrackerServer] Error parsing packet " + packetToString(received), e); + } catch (SocketTimeoutException e) {} catch (Exception e) { + LogManager + .warning( + "[TrackerServer] Error parsing packet " + packetToString(received), + e + ); } if (lastKeepup + 500 < System.currentTimeMillis()) { lastKeepup = System.currentTimeMillis(); synchronized (connections) { - for (Device conn : connections) { + for (UDPDevice conn : connections) { bb.limit(bb.capacity()); bb.rewind(); parser.write(bb, conn, new UDPPacket1Heartbeat()); @@ -221,7 +322,7 @@ public class TrackersUDPServer extends Thread { } if (!conn.timedOut) { conn.timedOut = true; - LogManager.log.info("[TrackerServer] Tracker timed out: " + conn); + LogManager.info("[TrackerServer] Tracker timed out: " + conn); } } else { conn.timedOut = false; @@ -234,7 +335,11 @@ public class TrackersUDPServer extends Thread { } if (conn.serialBuffer.length() > 0) { if (conn.lastSerialUpdate + 500L < System.currentTimeMillis()) { - serialBuffer2.append('[').append(conn.name).append("] ").append(conn.serialBuffer); + serialBuffer2 + .append('[') + .append(conn.name) + .append("] ") + .append(conn.serialBuffer); System.out.println(serialBuffer2); serialBuffer2.setLength(0); conn.serialBuffer.setLength(0); @@ -248,7 +353,10 @@ public class TrackersUDPServer extends Thread { bb.putInt(10); bb.putLong(0); bb.putInt(conn.lastPingPacketId); - socket.send(new DatagramPacket(rcvBuffer, bb.position(), conn.address)); + socket + .send( + new DatagramPacket(rcvBuffer, bb.position(), conn.address) + ); } } } @@ -261,7 +369,8 @@ public class TrackersUDPServer extends Thread { } } - protected void processPacket(DatagramPacket received, UDPPacket packet, Device connection) throws IOException { + protected void processPacket(DatagramPacket received, UDPPacket packet, UDPDevice connection) + throws IOException { IMUTracker tracker = null; switch (packet.getPacketId()) { case UDPProtocolParser.PACKET_HEARTBEAT: @@ -318,7 +427,9 @@ public class TrackersUDPServer extends Thread { case 4: // PACKET_ACCEL case 5: // PACKET_MAG case 9: // PACKET_RAW_MAGENTOMETER - break; // None of these packets are used by SlimeVR trackers and are deprecated, use more generic PACKET_ROTATION_DATA + break; // None of these packets are used by SlimeVR trackers and + // are deprecated, use + // more generic PACKET_ROTATION_DATA case 8: // PACKET_CONFIG if (connection == null) break; @@ -329,11 +440,18 @@ public class TrackersUDPServer extends Thread { UDPPacket10PingPong ping = (UDPPacket10PingPong) packet; if (connection.lastPingPacketId == ping.pingId) { for (IMUTracker imuTracker : connection.sensors.values()) { - imuTracker.ping = (int) (System.currentTimeMillis() - connection.lastPingPacketTime) / 2; + imuTracker.ping = (int) (System.currentTimeMillis() + - connection.lastPingPacketTime) / 2; imuTracker.dataTick(); } } else { - LogManager.log.debug("[TrackerServer] Wrong ping id " + ping.pingId + " != " + connection.lastPingPacketId); + LogManager + .debug( + "[TrackerServer] Wrong ping id " + + ping.pingId + + " != " + + connection.lastPingPacketId + ); } break; case UDPProtocolParser.PACKET_SERIAL: @@ -363,11 +481,23 @@ public class TrackersUDPServer extends Thread { tracker = connection.sensors.get(tap.getSensorId()); if (tracker == null) break; - LogManager.log.info("[TrackerServer] Tap packet received from " + tracker.getName() + ": " + tap.tap); + LogManager + .info( + "[TrackerServer] Tap packet received from " + + tracker.getName() + + ": " + + tap.tap + ); break; case UDPProtocolParser.PACKET_ERROR: UDPPacket14Error error = (UDPPacket14Error) packet; - LogManager.log.severe("[TrackerServer] Error received from " + received.getSocketAddress() + ": " + error.errorNumber); + LogManager + .severe( + "[TrackerServer] Error received from " + + received.getSocketAddress() + + ": " + + error.errorNumber + ); if (connection == null) break; tracker = connection.sensors.get(error.getSensorId()); @@ -385,7 +515,15 @@ public class TrackersUDPServer extends Thread { bb.rewind(); parser.writeSensorInfoResponse(bb, connection, info); socket.send(new DatagramPacket(rcvBuffer, bb.position(), connection.address)); - LogManager.log.info("[TrackerServer] Sensor info for " + connection.descriptiveName + "/" + info.getSensorId() + ": " + info.sensorStatus); + LogManager + .info( + "[TrackerServer] Sensor info for " + + connection.descriptiveName + + "/" + + info.getSensorId() + + ": " + + info.sensorStatus + ); break; case UDPProtocolParser.PACKET_SIGNAL_STRENGTH: if (connection == null) @@ -410,12 +548,12 @@ public class TrackersUDPServer extends Thread { tracker.temperature = temp.temperature; break; default: - LogManager.log.warning("[TrackerServer] Skipped packet " + packet); + LogManager.warning("[TrackerServer] Skipped packet " + packet); break; } } - public List getConnections() { + public List getConnections() { return connections; } } diff --git a/src/main/java/dev/slimevr/vr/trackers/udp/Device.java b/src/main/java/dev/slimevr/vr/trackers/udp/UDPDevice.java similarity index 80% rename from src/main/java/dev/slimevr/vr/trackers/udp/Device.java rename to src/main/java/dev/slimevr/vr/trackers/udp/UDPDevice.java index 6b3397eef..2c85dc264 100644 --- a/src/main/java/dev/slimevr/vr/trackers/udp/Device.java +++ b/src/main/java/dev/slimevr/vr/trackers/udp/UDPDevice.java @@ -1,17 +1,17 @@ package dev.slimevr.vr.trackers.udp; import dev.slimevr.NetworkProtocol; +import dev.slimevr.vr.trackers.Device; import dev.slimevr.vr.trackers.IMUTracker; import java.net.InetAddress; import java.net.SocketAddress; import java.util.HashMap; import java.util.Map; -import java.util.concurrent.atomic.AtomicInteger; -public class Device { - public static final AtomicInteger nextLocalDeviceId = new AtomicInteger(); +public class UDPDevice implements Device { + public final int id; public Map sensors = new HashMap<>(); public SocketAddress address; @@ -28,10 +28,10 @@ public class Device { public int firmwareBuild = 0; public boolean timedOut = false; - public Device(SocketAddress address, InetAddress ipAddress) { + public UDPDevice(SocketAddress address, InetAddress ipAddress) { this.address = address; this.ipAddress = ipAddress; - this.id = Device.nextLocalDeviceId.incrementAndGet(); + this.id = UDPDevice.nextLocalDeviceId.incrementAndGet(); } public boolean isNextPacket(long packetId) { @@ -46,6 +46,7 @@ public class Device { return "udp:/" + ipAddress; } + @Override public int getId() { return id; } diff --git a/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket.java b/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket.java index b3b75e2b7..a08d50ef2 100644 --- a/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket.java +++ b/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket.java @@ -3,6 +3,7 @@ package dev.slimevr.vr.trackers.udp; import java.io.IOException; import java.nio.ByteBuffer; + public abstract class UDPPacket { /** diff --git a/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket0Heartbeat.java b/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket0Heartbeat.java index 3e4e40025..06f2157b5 100644 --- a/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket0Heartbeat.java +++ b/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket0Heartbeat.java @@ -3,6 +3,7 @@ package dev.slimevr.vr.trackers.udp; import java.io.IOException; import java.nio.ByteBuffer; + public class UDPPacket0Heartbeat extends UDPPacket { public UDPPacket0Heartbeat() { diff --git a/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket10PingPong.java b/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket10PingPong.java index ae4ab615f..913704881 100644 --- a/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket10PingPong.java +++ b/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket10PingPong.java @@ -3,6 +3,7 @@ package dev.slimevr.vr.trackers.udp; import java.io.IOException; import java.nio.ByteBuffer; + public class UDPPacket10PingPong extends UDPPacket { public int pingId; diff --git a/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket11Serial.java b/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket11Serial.java index cb6e222a0..df2f64398 100644 --- a/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket11Serial.java +++ b/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket11Serial.java @@ -3,6 +3,7 @@ package dev.slimevr.vr.trackers.udp; import java.io.IOException; import java.nio.ByteBuffer; + public class UDPPacket11Serial extends UDPPacket { public String serial; diff --git a/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket12BatteryLevel.java b/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket12BatteryLevel.java index cc5dfc4ec..056c3a836 100644 --- a/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket12BatteryLevel.java +++ b/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket12BatteryLevel.java @@ -3,6 +3,7 @@ package dev.slimevr.vr.trackers.udp; import java.io.IOException; import java.nio.ByteBuffer; + public class UDPPacket12BatteryLevel extends UDPPacket { public float voltage; diff --git a/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket13Tap.java b/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket13Tap.java index f43e23495..0bbcfed09 100644 --- a/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket13Tap.java +++ b/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket13Tap.java @@ -5,6 +5,7 @@ import dev.slimevr.vr.trackers.SensorTap; import java.io.IOException; import java.nio.ByteBuffer; + public class UDPPacket13Tap extends UDPPacket implements SensorSpecificPacket { public int sensorId; diff --git a/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket14Error.java b/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket14Error.java index 40df3a0c3..548757b0c 100644 --- a/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket14Error.java +++ b/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket14Error.java @@ -3,6 +3,7 @@ package dev.slimevr.vr.trackers.udp; import java.io.IOException; import java.nio.ByteBuffer; + public class UDPPacket14Error extends UDPPacket implements SensorSpecificPacket { public int sensorId; diff --git a/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket15SensorInfo.java b/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket15SensorInfo.java index 69021fc63..cbe1a64ec 100644 --- a/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket15SensorInfo.java +++ b/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket15SensorInfo.java @@ -5,6 +5,7 @@ import dev.slimevr.vr.trackers.TrackerStatus; import java.io.IOException; import java.nio.ByteBuffer; + public class UDPPacket15SensorInfo extends UDPPacket implements SensorSpecificPacket { public int sensorId; diff --git a/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket17RotationData.java b/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket17RotationData.java index c39733902..9209f988c 100644 --- a/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket17RotationData.java +++ b/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket17RotationData.java @@ -5,6 +5,7 @@ import com.jme3.math.Quaternion; import java.io.IOException; import java.nio.ByteBuffer; + public class UDPPacket17RotationData extends UDPPacket implements SensorSpecificPacket { public static final int DATA_TYPE_NORMAL = 1; diff --git a/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket18MagnetometerAccuracy.java b/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket18MagnetometerAccuracy.java index ff3b83ff5..8525b88a6 100644 --- a/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket18MagnetometerAccuracy.java +++ b/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket18MagnetometerAccuracy.java @@ -3,6 +3,7 @@ package dev.slimevr.vr.trackers.udp; import java.io.IOException; import java.nio.ByteBuffer; + public class UDPPacket18MagnetometerAccuracy extends UDPPacket implements SensorSpecificPacket { public int sensorId; diff --git a/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket19SignalStrength.java b/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket19SignalStrength.java index 66cb69a25..d949b6f02 100644 --- a/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket19SignalStrength.java +++ b/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket19SignalStrength.java @@ -3,6 +3,7 @@ package dev.slimevr.vr.trackers.udp; import java.io.IOException; import java.nio.ByteBuffer; + public class UDPPacket19SignalStrength extends UDPPacket implements SensorSpecificPacket { public int sensorId; diff --git a/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket1Rotation.java b/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket1Rotation.java index 8154c140f..5efba3e5b 100644 --- a/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket1Rotation.java +++ b/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket1Rotation.java @@ -5,6 +5,7 @@ import com.jme3.math.Quaternion; import java.io.IOException; import java.nio.ByteBuffer; + public class UDPPacket1Rotation extends UDPPacket implements SensorSpecificPacket { public final Quaternion rotation = new Quaternion(); diff --git a/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket200ProtocolChange.java b/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket200ProtocolChange.java index 319ce49d2..f077f8718 100644 --- a/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket200ProtocolChange.java +++ b/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket200ProtocolChange.java @@ -3,6 +3,7 @@ package dev.slimevr.vr.trackers.udp; import java.io.IOException; import java.nio.ByteBuffer; + public class UDPPacket200ProtocolChange extends UDPPacket { public int targetProtocol; diff --git a/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket20Temperature.java b/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket20Temperature.java index 11697b20a..9a55ec0a2 100644 --- a/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket20Temperature.java +++ b/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket20Temperature.java @@ -3,6 +3,7 @@ package dev.slimevr.vr.trackers.udp; import java.io.IOException; import java.nio.ByteBuffer; + public class UDPPacket20Temperature extends UDPPacket implements SensorSpecificPacket { public int sensorId; diff --git a/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket3Handshake.java b/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket3Handshake.java index a3fc64070..550fc1962 100644 --- a/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket3Handshake.java +++ b/src/main/java/dev/slimevr/vr/trackers/udp/UDPPacket3Handshake.java @@ -3,6 +3,7 @@ package dev.slimevr.vr.trackers.udp; import java.io.IOException; import java.nio.ByteBuffer; + public class UDPPacket3Handshake extends UDPPacket { public int boardType; @@ -39,11 +40,21 @@ public class UDPPacket3Handshake extends UDPPacket { firmwareBuild = buf.getInt(); int length = 0; if (buf.remaining() > 0) - length = buf.get(); // firmware version length is 1 longer than that because it's nul-terminated + length = buf.get(); // firmware version length is 1 longer than + // that because it's nul-terminated firmware = readASCIIString(buf, length); if (buf.remaining() >= mac.length) { buf.get(mac); - macString = String.format("%02X:%02X:%02X:%02X:%02X:%02X", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); + macString = String + .format( + "%02X:%02X:%02X:%02X:%02X:%02X", + mac[0], + mac[1], + mac[2], + mac[3], + mac[4], + mac[5] + ); if (macString.equals("00:00:00:00:00:00")) macString = null; } @@ -53,7 +64,9 @@ public class UDPPacket3Handshake extends UDPPacket { @Override public void writeData(ByteBuffer buf) throws IOException { // Never sent back in current protocol - // Handshake for RAW SlimeVR and legacy owoTrack has different packet id byte order from normal packets + // Handshake for RAW SlimeVR and legacy owoTrack has different packet id + // byte + // order from normal packets // So it's handled by raw protocol call } } diff --git a/src/main/java/dev/slimevr/vr/trackers/udp/UDPProtocolParser.java b/src/main/java/dev/slimevr/vr/trackers/udp/UDPProtocolParser.java index 9f59dddcc..db666cb7a 100644 --- a/src/main/java/dev/slimevr/vr/trackers/udp/UDPProtocolParser.java +++ b/src/main/java/dev/slimevr/vr/trackers/udp/UDPProtocolParser.java @@ -4,18 +4,21 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; + public class UDPProtocolParser { public static final int PACKET_HEARTBEAT = 0; public static final int PACKET_ROTATION = 1; // Deprecated - //public static final int PACKET_GYRO = 2; // Deprecated + // public static final int PACKET_GYRO = 2; // Deprecated public static final int PACKET_HANDSHAKE = 3; - //public static final int PACKET_ACCEL = 4; // Not parsed by server - //public static final int PACKET_MAG = 5; // Deprecated - //public static final int PACKET_RAW_CALIBRATION_DATA = 6; // Not parsed by server - //public static final int PACKET_CALIBRATION_FINISHED = 7; // Not parsed by server - //public static final int PACKET_CONFIG = 8; // Not parsed by server - //public static final int PACKET_RAW_MAGNETOMETER = 9 // Deprecated + // public static final int PACKET_ACCEL = 4; // Not parsed by server + // public static final int PACKET_MAG = 5; // Deprecated + // public static final int PACKET_RAW_CALIBRATION_DATA = 6; // Not parsed by + // server + // public static final int PACKET_CALIBRATION_FINISHED = 7; // Not parsed by + // server + // public static final int PACKET_CONFIG = 8; // Not parsed by server + // public static final int PACKET_RAW_MAGNETOMETER = 9 // Deprecated public static final int PACKET_PING_PONG = 10; public static final int PACKET_SERIAL = 11; public static final int PACKET_BATTERY_LEVEL = 12; @@ -41,13 +44,22 @@ public class UDPProtocolParser { public UDPProtocolParser() { } - public UDPPacket parse(ByteBuffer buf, Device connection) throws IOException { + public UDPPacket parse(ByteBuffer buf, UDPDevice connection) throws IOException { int packetId = buf.getInt(); long packetNumber = buf.getLong(); if (connection != null) { if (!connection.isNextPacket(packetNumber)) { // Skip packet because it's not next - throw new IOException("Out of order packet received: id " + packetId + ", number " + packetNumber + ", last " + connection.lastPacketNumber + ", from " + connection); + throw new IOException( + "Out of order packet received: id " + + packetId + + ", number " + + packetNumber + + ", last " + + connection.lastPacketNumber + + ", from " + + connection + ); } connection.lastPacket = System.currentTimeMillis(); } @@ -55,22 +67,29 @@ public class UDPProtocolParser { if (newPacket != null) { newPacket.readData(buf); } else { - //LogManager.log.debug("[UDPProtocolParser] Skipped packet id " + packetId + " from " + connection); + // LogManager.log.debug("[UDPProtocolParser] Skipped packet id " + + // packetId + " + // from " + connection); } return newPacket; } - public void write(ByteBuffer buf, Device connection, UDPPacket packet) throws IOException { + public void write(ByteBuffer buf, UDPDevice connection, UDPPacket packet) throws IOException { buf.putInt(packet.getPacketId()); - buf.putLong(0); // Packet number is always 0 when sending data to trackers + buf.putLong(0); // Packet number is always 0 when sending data to + // trackers packet.writeData(buf); } - public void writeHandshakeResponse(ByteBuffer buf, Device connection) throws IOException { + public void writeHandshakeResponse(ByteBuffer buf, UDPDevice connection) throws IOException { buf.put(HANDSHAKE_BUFFER); } - public void writeSensorInfoResponse(ByteBuffer buf, Device connection, UDPPacket15SensorInfo packet) throws IOException { + public void writeSensorInfoResponse( + ByteBuffer buf, + UDPDevice connection, + UDPPacket15SensorInfo packet + ) throws IOException { buf.putInt(packet.getPacketId()); buf.put((byte) packet.sensorId); buf.put((byte) packet.sensorStatus); diff --git a/src/main/java/dev/slimevr/websocketapi/WebSocketVRBridge.java b/src/main/java/dev/slimevr/websocketapi/WebSocketVRBridge.java index 3ee198513..2e0d47cf0 100644 --- a/src/main/java/dev/slimevr/websocketapi/WebSocketVRBridge.java +++ b/src/main/java/dev/slimevr/websocketapi/WebSocketVRBridge.java @@ -16,6 +16,7 @@ import org.json.JSONObject; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; + public class WebSocketVRBridge extends WebsocketAPI implements Bridge { private final Vector3f vBuffer = new Vector3f(); @@ -28,13 +29,22 @@ public class WebSocketVRBridge extends WebsocketAPI implements Bridge { private final HMDTracker internalHMDTracker = new HMDTracker("internal://HMD"); private final AtomicBoolean newHMDData = new AtomicBoolean(false); - public WebSocketVRBridge(HMDTracker hmd, List shareTrackers, VRServer server) { + public WebSocketVRBridge( + HMDTracker hmd, + List shareTrackers, + VRServer server + ) { super(server, server.getProtocolAPI()); this.hmd = hmd; this.shareTrackers = new FastList<>(shareTrackers); this.internalTrackers = new FastList<>(shareTrackers.size()); for (Tracker t : shareTrackers) { - ComputedTracker ct = new ComputedTracker(t.getTrackerId(), "internal://" + t.getName(), true, true); + ComputedTracker ct = new ComputedTracker( + t.getTrackerId(), + "internal://" + t.getName(), + true, + true + ); ct.setStatus(TrackerStatus.OK); ct.bodyPosition = t.getBodyPosition(); this.internalTrackers.add(ct); @@ -78,7 +88,7 @@ public class WebSocketVRBridge extends WebsocketAPI implements Bridge { @Override public void onMessage(WebSocket conn, String message) { - //LogManager.log.info(message); + // LogManager.info(message); try { JSONObject json = new JSONObject(message); if (json.has("type")) { @@ -89,22 +99,48 @@ public class WebSocketVRBridge extends WebsocketAPI implements Bridge { case "action": parseAction(json, conn); return; - case "config": // TODO Ignore it for now, it should only register HMD in our test case with id 0 - LogManager.log.info("[WebSocket] Config received: " + json); + case "config": // TODO Ignore it for now, it should only + // register HMD in our test case with id + // 0 + LogManager.info("[WebSocket] Config received: " + json); return; } } - LogManager.log.warning("[WebSocket] Unrecognized message from " + conn.getRemoteSocketAddress().getAddress().getHostAddress() + ": " + message); + LogManager + .warning( + "[WebSocket] Unrecognized message from " + + conn.getRemoteSocketAddress().getAddress().getHostAddress() + + ": " + + message + ); } catch (Exception e) { - LogManager.log.severe("[WebSocket] Exception parsing message from " + conn.getRemoteSocketAddress().getAddress().getHostAddress() + ". Message: " + message, e); + LogManager + .severe( + "[WebSocket] Exception parsing message from " + + conn.getRemoteSocketAddress().getAddress().getHostAddress() + + ". Message: " + + message, + e + ); } } private void parsePosition(JSONObject json, WebSocket conn) throws JSONException { if (json.optInt("tracker_id") == 0) { // Read HMD information - internalHMDTracker.position.set((float) json.optDouble("x"), (float) json.optDouble("y") + 0.2f, (float) json.optDouble("z")); // TODO Wtf is this hack? VRWorkout issue? - internalHMDTracker.rotation.set((float) json.optDouble("qx"), (float) json.optDouble("qy"), (float) json.optDouble("qz"), (float) json.optDouble("qw")); + internalHMDTracker.position + .set( + (float) json.optDouble("x"), + (float) json.optDouble("y") + 0.2f, + (float) json.optDouble("z") + ); // TODO Wtf is this hack? VRWorkout issue? + internalHMDTracker.rotation + .set( + (float) json.optDouble("qx"), + (float) json.optDouble("qy"), + (float) json.optDouble("qz"), + (float) json.optDouble("qw") + ); internalHMDTracker.dataTick(); newHMDData.set(true); @@ -142,14 +178,26 @@ public class WebSocketVRBridge extends WebsocketAPI implements Bridge { @Override public void onError(WebSocket conn, Exception ex) { - LogManager.log.severe("[WebSocket] Exception on connection " + (conn != null ? conn.getRemoteSocketAddress().getAddress().getHostAddress() : null), ex); + LogManager + .severe( + "[WebSocket] Exception on connection " + + (conn != null + ? conn + .getRemoteSocketAddress() + .getAddress() + .getHostAddress() + : null), + ex + ); } @Override public void onStart() { - LogManager.log.info("[WebSocket] Web Socket VR Bridge started on port " + getPort()); + LogManager.info("[WebSocket] Web Socket VR Bridge started on port " + getPort()); setConnectionLostTimeout(0); - setConnectionLostTimeout(1); //This has to be removed for Android (keepalive did not work for me @mgschwan) + setConnectionLostTimeout(1); // This has to be removed for Android + // (keepalive did not work for me + // @mgschwan) } @Override diff --git a/src/main/java/dev/slimevr/websocketapi/WebsocketAPI.java b/src/main/java/dev/slimevr/websocketapi/WebsocketAPI.java index ee32ee0ff..c6d979a6e 100644 --- a/src/main/java/dev/slimevr/websocketapi/WebsocketAPI.java +++ b/src/main/java/dev/slimevr/websocketapi/WebsocketAPI.java @@ -15,56 +15,71 @@ import java.nio.ByteBuffer; import java.util.Collections; import java.util.stream.Stream; + public class WebsocketAPI extends WebSocketServer implements ProtocolAPIServer { - + public final VRServer server; public final ProtocolAPI protocolAPI; - + public WebsocketAPI(VRServer server, ProtocolAPI protocolAPI) { super(new InetSocketAddress(21110), Collections.singletonList(new Draft_6455())); this.server = server; this.protocolAPI = protocolAPI; - + this.protocolAPI.registerAPIServer(this); } - + @Override public void onOpen(WebSocket conn, ClientHandshake handshake) { - LogManager.log.info("[WebSocketAPI] New connection from: " + conn.getRemoteSocketAddress().getAddress().getHostAddress()); + LogManager + .info( + "[WebSocketAPI] New connection from: " + + conn.getRemoteSocketAddress().getAddress().getHostAddress() + ); conn.setAttachment(new WebsocketConnection(conn)); } - + @Override public void onClose(WebSocket conn, int code, String reason, boolean remote) { - LogManager.log.info("[WebSocketAPI] Disconnected: " + conn.getRemoteSocketAddress().getAddress().getHostAddress() + ", (" + code + ") " + reason + ". Remote: " + remote); + LogManager + .info( + "[WebSocketAPI] Disconnected: " + + conn.getRemoteSocketAddress().getAddress().getHostAddress() + + ", (" + + code + + ") " + + reason + + ". Remote: " + + remote + ); } - + @Override public void onMessage(WebSocket conn, String message) { } - + @Override public void onMessage(WebSocket conn, ByteBuffer message) { - var connection = conn. getAttachment(); - if(connection != null) + var connection = conn.getAttachment(); + if (connection != null) this.protocolAPI.onMessage(connection, message); } - + @Override public void onError(WebSocket conn, Exception ex) { ex.printStackTrace(); } - + @Override public void onStart() { - LogManager.log.info("[WebSocketAPI] Web Socket API started on port " + getPort()); + LogManager.info("[WebSocketAPI] Web Socket API started on port " + getPort()); setConnectionLostTimeout(0); } - + @Override public Stream getAPIConnections() { return this.getConnections().stream().map(conn -> { - var c = conn. getAttachment(); + var c = conn.getAttachment(); return (GenericConnection) c; }).filter(c -> c != null); } diff --git a/src/main/java/dev/slimevr/websocketapi/WebsocketConnection.java b/src/main/java/dev/slimevr/websocketapi/WebsocketConnection.java index 672eaa327..47a297bdc 100644 --- a/src/main/java/dev/slimevr/websocketapi/WebsocketConnection.java +++ b/src/main/java/dev/slimevr/websocketapi/WebsocketConnection.java @@ -7,6 +7,7 @@ import org.java_websocket.WebSocket; import java.nio.ByteBuffer; import java.util.UUID; + public class WebsocketConnection implements GenericConnection { public final ConnectionContext context; diff --git a/src/test/java/dev/slimevr/unit/ReferenceAdjustmentsTests.java b/src/test/java/dev/slimevr/unit/ReferenceAdjustmentsTests.java index c96f6c57b..e17e906bf 100644 --- a/src/test/java/dev/slimevr/unit/ReferenceAdjustmentsTests.java +++ b/src/test/java/dev/slimevr/unit/ReferenceAdjustmentsTests.java @@ -19,77 +19,171 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.DynamicTest.dynamicTest; + /** * Tests {@link ReferenceAdjustedTracker#resetFull(Quaternion)} */ public class ReferenceAdjustmentsTests { - private static final int[] yaws = {0, 45, 90, 180, 270}; - private static final int[] pitches = {0, 15, 35, -15, -35}; - private static final int[] rolls = {0, 15, 35, -15, -35}; + private static final int[] yaws = { 0, 45, 90, 180, 270 }; + private static final int[] pitches = { 0, 15, 35, -15, -35 }; + private static final int[] rolls = { 0, 15, 35, -15, -35 }; private static final boolean PRINT_TEST_RESULTS = false; private static int errors = 0; private static int successes = 0; public static Stream getAnglesSet() { - return IntStream.of(yaws).mapToObj((yaw) -> - IntStream.of(pitches).mapToObj((pitch) -> - IntStream.of(rolls).mapToObj((roll) -> new AnglesSet(pitch, yaw, roll) - ))).flatMap(Function.identity()).flatMap(Function.identity()); + return IntStream + .of(yaws) + .mapToObj( + (yaw) -> IntStream + .of(pitches) + .mapToObj( + ( + pitch + ) -> IntStream.of(rolls).mapToObj((roll) -> new AnglesSet(pitch, yaw, roll)) + ) + ) + .flatMap(Function.identity()) + .flatMap(Function.identity()); } - private static String name(int yaw, int pitch, int roll, float[] angles, float[] anglesAdj, float[] anglesDiff) { - return "Rot: " + yaw + "/" + pitch + "/" + roll + ". " - + "Angles: " + StringUtils.prettyNumber(angles[0] * FastMath.RAD_TO_DEG, 1) + "/" + StringUtils.prettyNumber(anglesAdj[0] * FastMath.RAD_TO_DEG, 1) + ", " - + StringUtils.prettyNumber(angles[1] * FastMath.RAD_TO_DEG, 1) + "/" + StringUtils.prettyNumber(anglesAdj[1] * FastMath.RAD_TO_DEG, 1) + ", " - + StringUtils.prettyNumber(angles[2] * FastMath.RAD_TO_DEG, 1) + "/" + StringUtils.prettyNumber(anglesAdj[2] * FastMath.RAD_TO_DEG, 1) + ". Diff: " - + StringUtils.prettyNumber(anglesDiff[0] * FastMath.RAD_TO_DEG, 1) + ", " - + StringUtils.prettyNumber(anglesDiff[1] * FastMath.RAD_TO_DEG, 1) + ", " - + StringUtils.prettyNumber(anglesDiff[2] * FastMath.RAD_TO_DEG, 1); + private static String name( + int yaw, + int pitch, + int roll, + float[] angles, + float[] anglesAdj, + float[] anglesDiff + ) { + return "Rot: " + + yaw + + "/" + + pitch + + "/" + + roll + + ". " + + "Angles: " + + StringUtils.prettyNumber(angles[0] * FastMath.RAD_TO_DEG, 1) + + "/" + + StringUtils.prettyNumber(anglesAdj[0] * FastMath.RAD_TO_DEG, 1) + + ", " + + StringUtils.prettyNumber(angles[1] * FastMath.RAD_TO_DEG, 1) + + "/" + + StringUtils.prettyNumber(anglesAdj[1] * FastMath.RAD_TO_DEG, 1) + + ", " + + StringUtils.prettyNumber(angles[2] * FastMath.RAD_TO_DEG, 1) + + "/" + + StringUtils.prettyNumber(anglesAdj[2] * FastMath.RAD_TO_DEG, 1) + + ". Diff: " + + StringUtils.prettyNumber(anglesDiff[0] * FastMath.RAD_TO_DEG, 1) + + ", " + + StringUtils.prettyNumber(anglesDiff[1] * FastMath.RAD_TO_DEG, 1) + + ", " + + StringUtils.prettyNumber(anglesDiff[2] * FastMath.RAD_TO_DEG, 1); } public static Quaternion q(float pitch, float yaw, float roll) { - return new Quaternion().fromAngles(pitch * FastMath.DEG_TO_RAD, yaw * FastMath.DEG_TO_RAD, roll * FastMath.DEG_TO_RAD); + return new Quaternion() + .fromAngles( + pitch * FastMath.DEG_TO_RAD, + yaw * FastMath.DEG_TO_RAD, + roll * FastMath.DEG_TO_RAD + ); } public static String toDegs(Quaternion q) { float[] degs = new float[3]; q.toAngles(degs); - return StringUtils.prettyNumber(degs[0] * FastMath.RAD_TO_DEG, 0) + "," + StringUtils.prettyNumber(degs[1] * FastMath.RAD_TO_DEG, 0) + "," + StringUtils.prettyNumber(degs[2] * FastMath.RAD_TO_DEG, 0); + return StringUtils.prettyNumber(degs[0] * FastMath.RAD_TO_DEG, 0) + + "," + + StringUtils.prettyNumber(degs[1] * FastMath.RAD_TO_DEG, 0) + + "," + + StringUtils.prettyNumber(degs[2] * FastMath.RAD_TO_DEG, 0); } @TestFactory Stream getTestsYaw() { - return getAnglesSet().map((p) -> - dynamicTest("Adjustment Yaw Test of Tracker(" + p.pitch + "," + p.yaw + "," + p.roll + ")", - () -> IntStream.of(yaws).forEach((refYaw) -> - checkReferenceAdjustmentYaw(q(p.pitch, p.yaw, p.roll), 0, refYaw, 0)) - )); + return getAnglesSet() + .map( + (p) -> dynamicTest( + "Adjustment Yaw Test of Tracker(" + p.pitch + "," + p.yaw + "," + p.roll + ")", + () -> IntStream + .of(yaws) + .forEach( + (refYaw) -> checkReferenceAdjustmentYaw( + q(p.pitch, p.yaw, p.roll), + 0, + refYaw, + 0 + ) + ) + ) + ); } @TestFactory Stream getTestsFull() { - return getAnglesSet().map((p) -> - dynamicTest("Adjustment Full Test of Tracker(" + p.pitch + "," + p.yaw + "," + p.roll + ")", - () -> getAnglesSet().forEach((ref) -> - checkReferenceAdjustmentFull(q(p.pitch, p.yaw, p.roll), ref.pitch, ref.yaw, ref.roll)) - )); + return getAnglesSet() + .map( + (p) -> dynamicTest( + "Adjustment Full Test of Tracker(" + p.pitch + "," + p.yaw + "," + p.roll + ")", + () -> getAnglesSet() + .forEach( + (ref) -> checkReferenceAdjustmentFull( + q(p.pitch, p.yaw, p.roll), + ref.pitch, + ref.yaw, + ref.roll + ) + ) + ) + ); } // TODO : Test is not passing because the test is wrong // See issue https://github.com/SlimeVR/SlimeVR-Server/issues/55 - //@TestFactory + // @TestFactory Stream getTestsForRotation() { - return getAnglesSet().map((p) -> - IntStream.of(yaws).mapToObj((refYaw) -> - dynamicTest("Adjustment Rotation Test of Tracker(" + p.pitch + "," + p.yaw + "," + p.roll + "), Ref " + refYaw, - () -> testAdjustedTrackerRotation(q(p.pitch, p.yaw, p.roll), 0, refYaw, 0) - ))).flatMap(Function.identity()); + return getAnglesSet() + .map( + (p) -> IntStream + .of(yaws) + .mapToObj( + (refYaw) -> dynamicTest( + "Adjustment Rotation Test of Tracker(" + + p.pitch + + "," + + p.yaw + + "," + + p.roll + + "), Ref " + + refYaw, + () -> testAdjustedTrackerRotation( + q(p.pitch, p.yaw, p.roll), + 0, + refYaw, + 0 + ) + ) + ) + ) + .flatMap(Function.identity()); } - public void checkReferenceAdjustmentFull(Quaternion trackerQuat, int refPitch, int refYaw, int refRoll) { + public void checkReferenceAdjustmentFull( + Quaternion trackerQuat, + int refPitch, + int refYaw, + int refRoll + ) { Quaternion referenceQuat = q(refPitch, refYaw, refRoll); - ComputedTracker tracker = new ComputedTracker(Tracker.getNextLocalTrackerId(), "test", true, false); + ComputedTracker tracker = new ComputedTracker( + Tracker.getNextLocalTrackerId(), + "test", + true, + false + ); tracker.rotation.set(trackerQuat); ReferenceAdjustedTracker adj = new ReferenceAdjustedTracker<>(tracker); adj.resetFull(referenceQuat); @@ -102,25 +196,59 @@ public class ReferenceAdjustmentsTests { targetTrackerRotation.toAngles(angles); targetTrackerRotation.fromAngles(0, angles[1], 0); - assertEquals(new QuatEqualFullWithEpsilon(read), new QuatEqualFullWithEpsilon(targetTrackerRotation), - "Adjusted quat is not equal to reference quat (" + toDegs(targetTrackerRotation) + " vs " + toDegs(read) + ")"); + assertEquals( + new QuatEqualFullWithEpsilon(read), + new QuatEqualFullWithEpsilon(targetTrackerRotation), + "Adjusted quat is not equal to reference quat (" + + toDegs(targetTrackerRotation) + + " vs " + + toDegs(read) + + ")" + ); } - public void checkReferenceAdjustmentYaw(Quaternion trackerQuat, int refPitch, int refYaw, int refRoll) { + public void checkReferenceAdjustmentYaw( + Quaternion trackerQuat, + int refPitch, + int refYaw, + int refRoll + ) { Quaternion referenceQuat = q(refPitch, refYaw, refRoll); - ComputedTracker tracker = new ComputedTracker(Tracker.getNextLocalTrackerId(), "test", true, false); + ComputedTracker tracker = new ComputedTracker( + Tracker.getNextLocalTrackerId(), + "test", + true, + false + ); tracker.rotation.set(trackerQuat); ReferenceAdjustedTracker adj = new ReferenceAdjustedTracker<>(tracker); adj.resetYaw(referenceQuat); Quaternion read = new Quaternion(); assertTrue(adj.getRotation(read), "Adjusted tracker didn't return rotation"); - assertEquals(new QuatEqualYawWithEpsilon(referenceQuat), new QuatEqualYawWithEpsilon(read), - "Adjusted quat is not equal to reference quat (" + toDegs(referenceQuat) + " vs " + toDegs(read) + ")"); + assertEquals( + new QuatEqualYawWithEpsilon(referenceQuat), + new QuatEqualYawWithEpsilon(read), + "Adjusted quat is not equal to reference quat (" + + toDegs(referenceQuat) + + " vs " + + toDegs(read) + + ")" + ); } - private void testAdjustedTrackerRotation(Quaternion trackerQuat, int refPitch, int refYaw, int refRoll) { + private void testAdjustedTrackerRotation( + Quaternion trackerQuat, + int refPitch, + int refYaw, + int refRoll + ) { Quaternion referenceQuat = q(refPitch, refYaw, refRoll); - ComputedTracker tracker = new ComputedTracker(Tracker.getNextLocalTrackerId(), "test", true, false); + ComputedTracker tracker = new ComputedTracker( + Tracker.getNextLocalTrackerId(), + "test", + true, + false + ); tracker.rotation.set(trackerQuat); ReferenceAdjustedTracker adj = new ReferenceAdjustedTracker<>(tracker); adj.resetFull(referenceQuat); @@ -147,8 +275,18 @@ public class ReferenceAdjustmentsTests { for (int yaw = 0; yaw <= 360; yaw += 30) { for (int pitch = -90; pitch <= 90; pitch += 15) { for (int roll = -90; roll <= 90; roll += 15) { - rotation.fromAngles(pitch * FastMath.DEG_TO_RAD, yaw * FastMath.DEG_TO_RAD, roll * FastMath.DEG_TO_RAD); - rotationCompare.fromAngles(pitch * FastMath.DEG_TO_RAD, (yaw + refYaw) * FastMath.DEG_TO_RAD, roll * FastMath.DEG_TO_RAD); + rotation + .fromAngles( + pitch * FastMath.DEG_TO_RAD, + yaw * FastMath.DEG_TO_RAD, + roll * FastMath.DEG_TO_RAD + ); + rotationCompare + .fromAngles( + pitch * FastMath.DEG_TO_RAD, + (yaw + refYaw) * FastMath.DEG_TO_RAD, + roll * FastMath.DEG_TO_RAD + ); rotationNode.localTransform.setRotation(rotation); rotationNode.update(); tracker.rotation.set(trackerNode.worldTransform.getRotation()); @@ -161,10 +299,18 @@ public class ReferenceAdjustmentsTests { diff.toAngles(anglesDiff); if (!PRINT_TEST_RESULTS) { - assertTrue(FloatMath.equalsToZero(anglesDiff[0]) && FloatMath.equalsToZero(anglesDiff[1]) && FloatMath.equalsToZero(anglesDiff[2]), - name(yaw, pitch, roll, angles, anglesAdj, anglesDiff)); + assertTrue( + FloatMath.equalsToZero(anglesDiff[0]) + && FloatMath.equalsToZero(anglesDiff[1]) + && FloatMath.equalsToZero(anglesDiff[2]), + name(yaw, pitch, roll, angles, anglesAdj, anglesDiff) + ); } else { - if (FloatMath.equalsToZero(anglesDiff[0]) && FloatMath.equalsToZero(anglesDiff[1]) && FloatMath.equalsToZero(anglesDiff[2])) + if ( + FloatMath.equalsToZero(anglesDiff[0]) + && FloatMath.equalsToZero(anglesDiff[1]) + && FloatMath.equalsToZero(anglesDiff[2]) + ) successes++; else errors++; @@ -248,8 +394,8 @@ public class ReferenceAdjustmentsTests { if (degs2[1] < -FloatMath.ANGLE_EPSILON_RAD) degs2[1] += FastMath.TWO_PI; return FloatMath.equalsWithEpsilon(degs1[0], degs2[0]) - && FloatMath.equalsWithEpsilon(degs1[1], degs2[1]) - && FloatMath.equalsWithEpsilon(degs1[2], degs2[2]); + && FloatMath.equalsWithEpsilon(degs1[1], degs2[1]) + && FloatMath.equalsWithEpsilon(degs1[2], degs2[2]); } }