Hopefully fix problems with uploading unnecessary files

pull/12/head
Caroline Bell 2020-02-25 14:19:29 -08:00
parent 85b82c1f2b
commit d3c5da572c
831 changed files with 5170 additions and 413 deletions

View File

@ -1,13 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"> <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes> <attributes>
<attribute name="module" value="true"/>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
@ -16,11 +28,5 @@
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="src" output="target/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/> <classpathentry kind="output" path="target/classes"/>
</classpath> </classpath>

83
.gitignore vendored
View File

@ -1,2 +1,83 @@
# Compiled class file
*.class
# Log file
*.log
# BlueJ files
*.ctxt
# Mobile Tools for Java (J2ME)
.mtj.tmp/
# Package Files #
*.jar
*.war
*.nar
*.ear
*.zip
*.tar.gz
*.rar
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
.metadata
bin/
tmp/
*.tmp
*.bak
*.swp
*~.nib
local.properties
.settings/
.loadpath
.recommenders
# External tool builders
.externalToolBuilders/
# Locally stored "Eclipse launch configurations"
*.launch
# PyDev specific (Python IDE for Eclipse)
*.pydevproject
# CDT-specific (C/C++ Development Tooling)
.cproject
# CDT- autotools
.autotools
# Java annotation processor (APT)
.factorypath
# PDT-specific (PHP Development Tools)
.buildpath
# sbteclipse plugin
.target
# Tern plugin
.tern-project
# TeXlipse plugin
.texlipse
# STS (Spring Tool Suite)
.springBeans
# Code Recommenders
.recommenders/
# Annotation Processing
.apt_generated/
.apt_generated_test/
# Scala IDE specific (Scala & Java development for Eclipse)
.cache-main
.scala_dependencies
.worksheet
.project
/target/ /target/
*.class

View File

@ -1,23 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>ginger1.2</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>

View File

@ -1,374 +0,0 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=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_type_members_on_columns=false
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=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_assignment=0
org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16
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=80
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=0
org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
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=16
org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0
org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
org.eclipse.jdt.core.formatter.alignment_for_shift_operator=0
org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16
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_type_declaration=16
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_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_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
org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
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_statement_group_in_switch=0
org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=next_line
org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line
org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=next_line
org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line
org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=next_line
org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line
org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line
org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line
org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=false
org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=true
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=true
org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=true
org.eclipse.jdt.core.formatter.comment.format_block_comments=false
org.eclipse.jdt.core.formatter.comment.format_header=false
org.eclipse.jdt.core.formatter.comment.format_html=false
org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
org.eclipse.jdt.core.formatter.comment.format_line_comments=false
org.eclipse.jdt.core.formatter.comment.format_source_code=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=do not insert
org.eclipse.jdt.core.formatter.comment.line_length=150
org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=false
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=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.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_type_header=true
org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=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.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=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
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=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=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_before_catch_in_try_statement=insert
org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=insert
org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert
org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert
org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=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_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
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
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_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_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=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
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
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_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
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
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_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=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
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
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_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
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
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_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=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=do not 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_switch=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
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=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=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=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
org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
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=false
org.eclipse.jdt.core.formatter.join_wrapped_lines=false
org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_if_single_item
org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_if_single_item
org.eclipse.jdt.core.formatter.keep_code_block_on_one_line=one_line_never
org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=true
org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=true
org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line=one_line_if_single_item
org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line=one_line_if_single_item
org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line=one_line_if_single_item
org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=true
org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line=one_line_if_single_item
org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line=one_line_if_single_item
org.eclipse.jdt.core.formatter.keep_method_body_on_one_line=one_line_if_single_item
org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=true
org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=true
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=true
org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_never
org.eclipse.jdt.core.formatter.lineSplit=500
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_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=0
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.put_empty_statement_on_new_line=false
org.eclipse.jdt.core.formatter.tabulation.char=tab
org.eclipse.jdt.core.formatter.tabulation.size=4
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_assignment_operator=false
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_outer_expressions_when_nested=true
org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter

View File

@ -1,3 +0,0 @@
eclipse.preferences.version=1
formatter_profile=_Caroline's Preference
formatter_settings_version=17

View File

@ -1,4 +0,0 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1

View File

@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>me.halotroop</groupId> <groupId>com.github.halotroop</groupId>
<artifactId>Ginger3D</artifactId> <artifactId>Ginger3D</artifactId>
<version>NIGHTLY</version> <version>NIGHTLY</version>
<name>Litecraft</name> <name>Litecraft</name>

View File

@ -0,0 +1,100 @@
info face="Candara" size=63 bold=0 italic=0 charset="" unicode=0 stretchH=100 smooth=1 aa=1 padding=8,8,8,8 spacing=0,0
common lineHeight=94 base=53 scaleW=512 scaleH=512 pages=1 packed=0
page id=0 file="candara.png"
chars count=95
char id=32 x=0 y=0 width=0 height=0 xoffset=0 yoffset=53 xadvance=30 page=0 chnl=0
char id=124 x=0 y=0 width=23 height=81 xoffset=-3 yoffset=-4 xadvance=32 page=0 chnl=0
char id=93 x=23 y=0 width=32 height=80 xoffset=-4 yoffset=-2 xadvance=38 page=0 chnl=0
char id=91 x=55 y=0 width=32 height=80 xoffset=-5 yoffset=-2 xadvance=38 page=0 chnl=0
char id=125 x=87 y=0 width=38 height=79 xoffset=-7 yoffset=-2 xadvance=38 page=0 chnl=0
char id=123 x=125 y=0 width=37 height=79 xoffset=-7 yoffset=-2 xadvance=38 page=0 chnl=0
char id=41 x=162 y=0 width=35 height=79 xoffset=-5 yoffset=-2 xadvance=38 page=0 chnl=0
char id=40 x=197 y=0 width=35 height=79 xoffset=-6 yoffset=-2 xadvance=38 page=0 chnl=0
char id=64 x=232 y=0 width=74 height=78 xoffset=-4 yoffset=-1 xadvance=80 page=0 chnl=0
char id=106 x=306 y=0 width=28 height=74 xoffset=-7 yoffset=2 xadvance=30 page=0 chnl=0
char id=81 x=334 y=0 width=55 height=73 xoffset=-5 yoffset=3 xadvance=60 page=0 chnl=0
char id=92 x=389 y=0 width=33 height=72 xoffset=-7 yoffset=-1 xadvance=33 page=0 chnl=0
char id=47 x=422 y=0 width=34 height=72 xoffset=-8 yoffset=-1 xadvance=33 page=0 chnl=0
char id=36 x=456 y=0 width=39 height=67 xoffset=-5 yoffset=3 xadvance=44 page=0 chnl=0
char id=103 x=0 y=81 width=48 height=66 xoffset=-5 yoffset=11 xadvance=50 page=0 chnl=0
char id=57 x=48 y=81 width=45 height=63 xoffset=-4 yoffset=11 xadvance=51 page=0 chnl=0
char id=51 x=93 y=81 width=43 height=63 xoffset=-6 yoffset=11 xadvance=47 page=0 chnl=0
char id=102 x=136 y=81 width=38 height=63 xoffset=-8 yoffset=-1 xadvance=37 page=0 chnl=0
char id=100 x=174 y=81 width=45 height=63 xoffset=-5 yoffset=0 xadvance=51 page=0 chnl=0
char id=53 x=219 y=81 width=41 height=62 xoffset=-4 yoffset=11 xadvance=47 page=0 chnl=0
char id=113 x=260 y=81 width=46 height=62 xoffset=-5 yoffset=14 xadvance=51 page=0 chnl=0
char id=112 x=306 y=81 width=47 height=62 xoffset=-5 yoffset=14 xadvance=51 page=0 chnl=0
char id=108 x=353 y=81 width=24 height=62 xoffset=-4 yoffset=0 xadvance=30 page=0 chnl=0
char id=98 x=377 y=81 width=46 height=62 xoffset=-4 yoffset=1 xadvance=51 page=0 chnl=0
char id=55 x=423 y=81 width=43 height=61 xoffset=-6 yoffset=11 xadvance=46 page=0 chnl=0
char id=52 x=0 y=147 width=47 height=61 xoffset=-6 yoffset=11 xadvance=50 page=0 chnl=0
char id=121 x=47 y=147 width=44 height=61 xoffset=-7 yoffset=15 xadvance=45 page=0 chnl=0
char id=107 x=91 y=147 width=44 height=61 xoffset=-4 yoffset=1 xadvance=47 page=0 chnl=0
char id=104 x=135 y=147 width=44 height=61 xoffset=-4 yoffset=1 xadvance=50 page=0 chnl=0
char id=38 x=179 y=147 width=56 height=60 xoffset=-5 yoffset=3 xadvance=59 page=0 chnl=0
char id=56 x=235 y=147 width=45 height=60 xoffset=-4 yoffset=2 xadvance=51 page=0 chnl=0
char id=105 x=280 y=147 width=26 height=60 xoffset=-5 yoffset=2 xadvance=30 page=0 chnl=0
char id=83 x=306 y=147 width=44 height=60 xoffset=-5 yoffset=3 xadvance=48 page=0 chnl=0
char id=79 x=350 y=147 width=55 height=60 xoffset=-5 yoffset=3 xadvance=60 page=0 chnl=0
char id=71 x=405 y=147 width=50 height=60 xoffset=-5 yoffset=3 xadvance=55 page=0 chnl=0
char id=67 x=455 y=147 width=47 height=60 xoffset=-5 yoffset=3 xadvance=51 page=0 chnl=0
char id=59 x=0 y=208 width=28 height=59 xoffset=-6 yoffset=15 xadvance=32 page=0 chnl=0
char id=63 x=28 y=208 width=36 height=59 xoffset=-6 yoffset=3 xadvance=38 page=0 chnl=0
char id=85 x=64 y=208 width=52 height=59 xoffset=-4 yoffset=4 xadvance=59 page=0 chnl=0
char id=74 x=116 y=208 width=38 height=59 xoffset=-7 yoffset=4 xadvance=42 page=0 chnl=0
char id=127 x=154 y=208 width=47 height=58 xoffset=-8 yoffset=4 xadvance=45 page=0 chnl=0
char id=35 x=201 y=208 width=48 height=58 xoffset=-7 yoffset=4 xadvance=48 page=0 chnl=0
char id=33 x=249 y=208 width=25 height=58 xoffset=-4 yoffset=4 xadvance=32 page=0 chnl=0
char id=54 x=274 y=208 width=45 height=58 xoffset=-4 yoffset=4 xadvance=51 page=0 chnl=0
char id=90 x=319 y=208 width=44 height=58 xoffset=-5 yoffset=4 xadvance=49 page=0 chnl=0
char id=89 x=363 y=208 width=51 height=58 xoffset=-7 yoffset=4 xadvance=51 page=0 chnl=0
char id=88 x=414 y=208 width=52 height=58 xoffset=-8 yoffset=4 xadvance=51 page=0 chnl=0
char id=87 x=0 y=267 width=73 height=58 xoffset=-8 yoffset=4 xadvance=72 page=0 chnl=0
char id=86 x=73 y=267 width=52 height=58 xoffset=-8 yoffset=4 xadvance=51 page=0 chnl=0
char id=84 x=125 y=267 width=48 height=58 xoffset=-7 yoffset=4 xadvance=48 page=0 chnl=0
char id=82 x=173 y=267 width=48 height=58 xoffset=-3 yoffset=4 xadvance=54 page=0 chnl=0
char id=80 x=221 y=267 width=46 height=58 xoffset=-3 yoffset=4 xadvance=51 page=0 chnl=0
char id=78 x=267 y=267 width=48 height=58 xoffset=-3 yoffset=4 xadvance=58 page=0 chnl=0
char id=77 x=315 y=267 width=62 height=58 xoffset=-4 yoffset=4 xadvance=70 page=0 chnl=0
char id=76 x=377 y=267 width=42 height=58 xoffset=-3 yoffset=4 xadvance=47 page=0 chnl=0
char id=75 x=419 y=267 width=48 height=58 xoffset=-3 yoffset=4 xadvance=53 page=0 chnl=0
char id=73 x=467 y=267 width=24 height=58 xoffset=-3 yoffset=4 xadvance=33 page=0 chnl=0
char id=72 x=0 y=325 width=48 height=58 xoffset=-3 yoffset=4 xadvance=57 page=0 chnl=0
char id=70 x=48 y=325 width=42 height=58 xoffset=-3 yoffset=4 xadvance=47 page=0 chnl=0
char id=69 x=90 y=325 width=43 height=58 xoffset=-3 yoffset=4 xadvance=49 page=0 chnl=0
char id=68 x=133 y=325 width=50 height=58 xoffset=-3 yoffset=4 xadvance=56 page=0 chnl=0
char id=66 x=183 y=325 width=47 height=58 xoffset=-3 yoffset=4 xadvance=53 page=0 chnl=0
char id=65 x=230 y=325 width=56 height=58 xoffset=-8 yoffset=4 xadvance=55 page=0 chnl=0
char id=37 x=286 y=325 width=47 height=57 xoffset=-6 yoffset=5 xadvance=48 page=0 chnl=0
char id=116 x=333 y=325 width=37 height=56 xoffset=-7 yoffset=7 xadvance=39 page=0 chnl=0
char id=48 x=370 y=325 width=45 height=51 xoffset=-4 yoffset=11 xadvance=51 page=0 chnl=0
char id=50 x=415 y=325 width=40 height=51 xoffset=-5 yoffset=11 xadvance=45 page=0 chnl=0
char id=49 x=455 y=325 width=32 height=51 xoffset=-6 yoffset=11 xadvance=38 page=0 chnl=0
char id=115 x=0 y=383 width=40 height=49 xoffset=-6 yoffset=14 xadvance=42 page=0 chnl=0
char id=111 x=40 y=383 width=47 height=49 xoffset=-5 yoffset=14 xadvance=51 page=0 chnl=0
char id=101 x=87 y=383 width=44 height=49 xoffset=-5 yoffset=14 xadvance=48 page=0 chnl=0
char id=99 x=131 y=383 width=40 height=49 xoffset=-5 yoffset=14 xadvance=44 page=0 chnl=0
char id=97 x=171 y=383 width=42 height=49 xoffset=-5 yoffset=14 xadvance=47 page=0 chnl=0
char id=117 x=213 y=383 width=44 height=48 xoffset=-4 yoffset=15 xadvance=50 page=0 chnl=0
char id=114 x=257 y=383 width=36 height=48 xoffset=-5 yoffset=14 xadvance=38 page=0 chnl=0
char id=110 x=293 y=383 width=45 height=48 xoffset=-5 yoffset=14 xadvance=50 page=0 chnl=0
char id=109 x=338 y=383 width=63 height=48 xoffset=-6 yoffset=14 xadvance=68 page=0 chnl=0
char id=58 x=401 y=383 width=25 height=47 xoffset=-4 yoffset=15 xadvance=32 page=0 chnl=0
char id=122 x=426 y=383 width=40 height=47 xoffset=-5 yoffset=15 xadvance=45 page=0 chnl=0
char id=120 x=466 y=383 width=45 height=47 xoffset=-6 yoffset=15 xadvance=48 page=0 chnl=0
char id=119 x=0 y=432 width=63 height=47 xoffset=-7 yoffset=15 xadvance=64 page=0 chnl=0
char id=118 x=63 y=432 width=45 height=47 xoffset=-7 yoffset=15 xadvance=46 page=0 chnl=0
char id=62 x=108 y=432 width=43 height=46 xoffset=-5 yoffset=15 xadvance=48 page=0 chnl=0
char id=60 x=151 y=432 width=43 height=46 xoffset=-5 yoffset=15 xadvance=48 page=0 chnl=0
char id=42 x=194 y=432 width=43 height=44 xoffset=-5 yoffset=-1 xadvance=48 page=0 chnl=0
char id=43 x=237 y=432 width=44 height=44 xoffset=-5 yoffset=16 xadvance=48 page=0 chnl=0
char id=94 x=281 y=432 width=47 height=43 xoffset=-7 yoffset=-1 xadvance=48 page=0 chnl=0
char id=39 x=328 y=432 width=25 height=40 xoffset=-3 yoffset=0 xadvance=32 page=0 chnl=0
char id=34 x=353 y=432 width=37 height=40 xoffset=-3 yoffset=0 xadvance=44 page=0 chnl=0
char id=44 x=390 y=432 width=28 height=38 xoffset=-6 yoffset=36 xadvance=32 page=0 chnl=0
char id=61 x=418 y=432 width=44 height=35 xoffset=-5 yoffset=20 xadvance=48 page=0 chnl=0
char id=96 x=462 y=432 width=29 height=28 xoffset=-5 yoffset=1 xadvance=33 page=0 chnl=0
char id=126 x=0 y=479 width=49 height=27 xoffset=-8 yoffset=25 xadvance=48 page=0 chnl=0
char id=46 x=49 y=479 width=25 height=26 xoffset=-4 yoffset=36 xadvance=32 page=0 chnl=0
char id=95 x=74 y=479 width=50 height=22 xoffset=-8 yoffset=56 xadvance=48 page=0 chnl=0
char id=45 x=124 y=479 width=31 height=22 xoffset=-7 yoffset=27 xadvance=32 page=0 chnl=0

Binary file not shown.

After

Width:  |  Height:  |  Size: 146 KiB

View File

@ -0,0 +1,198 @@
info face="Arial" size=57 bold=0 italic=0 charset="" unicode=0 stretchH=100 smooth=1 aa=1 padding=9,9,9,9 spacing=-2,-2
common lineHeight=82 base=53 scaleW=512 scaleH=512 pages=1 packed=0
page id=0 file="default.png"
chars count=97
char id=0 x=440 y=315 width=48 height=55 xoffset=-2 yoffset=7 xadvance=59 page=0 chnl=0
char id=10 x=0 y=0 width=0 height=0 xoffset=-9 yoffset=0 xadvance=16 page=0 chnl=0
char id=32 x=0 y=0 width=0 height=0 xoffset=-9 yoffset=0 xadvance=32 page=0 chnl=0
char id=33 x=138 y=255 width=24 height=60 xoffset=-3 yoffset=2 xadvance=33 page=0 chnl=0
char id=34 x=391 y=424 width=34 height=34 xoffset=-7 yoffset=2 xadvance=36 page=0 chnl=0
char id=35 x=340 y=255 width=49 height=60 xoffset=-8 yoffset=2 xadvance=48 page=0 chnl=0
char id=36 x=324 y=0 width=46 height=66 xoffset=-7 yoffset=1 xadvance=48 page=0 chnl=0
char id=37 x=277 y=255 width=63 height=60 xoffset=-6 yoffset=2 xadvance=67 page=0 chnl=0
char id=38 x=364 y=315 width=52 height=59 xoffset=-6 yoffset=3 xadvance=54 page=0 chnl=0
char id=39 x=425 y=424 width=24 height=34 xoffset=-6 yoffset=2 xadvance=27 page=0 chnl=0
char id=40 x=127 y=0 width=32 height=71 xoffset=-5 yoffset=2 xadvance=35 page=0 chnl=0
char id=41 x=159 y=0 width=33 height=71 xoffset=-8 yoffset=2 xadvance=35 page=0 chnl=0
char id=42 x=355 y=424 width=36 height=36 xoffset=-7 yoffset=2 xadvance=38 page=0 chnl=0
char id=43 x=130 y=424 width=46 height=46 xoffset=-6 yoffset=9 xadvance=49 page=0 chnl=0
char id=44 x=449 y=424 width=24 height=33 xoffset=-4 yoffset=38 xadvance=32 page=0 chnl=0
char id=45 x=71 y=473 width=35 height=24 xoffset=-8 yoffset=26 xadvance=35 page=0 chnl=0
char id=46 x=47 y=473 width=24 height=24 xoffset=-4 yoffset=38 xadvance=32 page=0 chnl=0
char id=47 x=207 y=255 width=35 height=60 xoffset=-9 yoffset=2 xadvance=32 page=0 chnl=0
char id=48 x=319 y=315 width=45 height=59 xoffset=-6 yoffset=3 xadvance=48 page=0 chnl=0
char id=49 x=422 y=255 width=34 height=59 xoffset=-3 yoffset=3 xadvance=48 page=0 chnl=0
char id=50 x=456 y=255 width=46 height=59 xoffset=-7 yoffset=3 xadvance=48 page=0 chnl=0
char id=51 x=0 y=315 width=45 height=59 xoffset=-6 yoffset=3 xadvance=48 page=0 chnl=0
char id=52 x=45 y=315 width=47 height=59 xoffset=-8 yoffset=3 xadvance=48 page=0 chnl=0
char id=53 x=92 y=315 width=45 height=59 xoffset=-6 yoffset=3 xadvance=48 page=0 chnl=0
char id=54 x=137 y=315 width=46 height=59 xoffset=-7 yoffset=3 xadvance=48 page=0 chnl=0
char id=55 x=183 y=315 width=46 height=59 xoffset=-7 yoffset=3 xadvance=48 page=0 chnl=0
char id=56 x=229 y=315 width=45 height=59 xoffset=-6 yoffset=3 xadvance=48 page=0 chnl=0
char id=57 x=274 y=315 width=45 height=59 xoffset=-6 yoffset=3 xadvance=48 page=0 chnl=0
char id=58 x=106 y=424 width=24 height=49 xoffset=-4 yoffset=13 xadvance=32 page=0 chnl=0
char id=59 x=416 y=315 width=24 height=58 xoffset=-4 yoffset=13 xadvance=32 page=0 chnl=0
char id=60 x=176 y=424 width=46 height=45 xoffset=-6 yoffset=10 xadvance=49 page=0 chnl=0
char id=61 x=309 y=424 width=46 height=36 xoffset=-6 yoffset=14 xadvance=49 page=0 chnl=0
char id=62 x=222 y=424 width=46 height=45 xoffset=-6 yoffset=10 xadvance=49 page=0 chnl=0
char id=63 x=162 y=255 width=45 height=60 xoffset=-6 yoffset=2 xadvance=48 page=0 chnl=0
char id=64 x=23 y=0 width=71 height=72 xoffset=-6 yoffset=2 xadvance=74 page=0 chnl=0
char id=65 x=390 y=73 width=57 height=60 xoffset=-10 yoffset=2 xadvance=54 page=0 chnl=0
char id=66 x=447 y=73 width=49 height=60 xoffset=-4 yoffset=2 xadvance=54 page=0 chnl=0
char id=67 x=426 y=0 width=53 height=62 xoffset=-6 yoffset=1 xadvance=57 page=0 chnl=0
char id=68 x=0 y=135 width=52 height=60 xoffset=-4 yoffset=2 xadvance=57 page=0 chnl=0
char id=69 x=52 y=135 width=49 height=60 xoffset=-4 yoffset=2 xadvance=54 page=0 chnl=0
char id=70 x=101 y=135 width=46 height=60 xoffset=-4 yoffset=2 xadvance=51 page=0 chnl=0
char id=71 x=0 y=73 width=56 height=62 xoffset=-6 yoffset=1 xadvance=60 page=0 chnl=0
char id=72 x=147 y=135 width=50 height=60 xoffset=-4 yoffset=2 xadvance=57 page=0 chnl=0
char id=73 x=479 y=0 width=24 height=60 xoffset=-4 yoffset=2 xadvance=31 page=0 chnl=0
char id=74 x=164 y=73 width=41 height=61 xoffset=-7 yoffset=2 xadvance=45 page=0 chnl=0
char id=75 x=197 y=135 width=52 height=60 xoffset=-4 yoffset=2 xadvance=54 page=0 chnl=0
char id=76 x=249 y=135 width=44 height=60 xoffset=-4 yoffset=2 xadvance=48 page=0 chnl=0
char id=77 x=293 y=135 width=58 height=60 xoffset=-5 yoffset=2 xadvance=63 page=0 chnl=0
char id=78 x=351 y=135 width=50 height=60 xoffset=-4 yoffset=2 xadvance=57 page=0 chnl=0
char id=79 x=56 y=73 width=57 height=62 xoffset=-6 yoffset=1 xadvance=60 page=0 chnl=0
char id=80 x=401 y=135 width=49 height=60 xoffset=-4 yoffset=2 xadvance=54 page=0 chnl=0
char id=81 x=370 y=0 width=56 height=65 xoffset=-6 yoffset=1 xadvance=60 page=0 chnl=0
char id=82 x=450 y=135 width=52 height=60 xoffset=-4 yoffset=2 xadvance=57 page=0 chnl=0
char id=83 x=113 y=73 width=51 height=62 xoffset=-6 yoffset=1 xadvance=54 page=0 chnl=0
char id=84 x=0 y=195 width=50 height=60 xoffset=-7 yoffset=2 xadvance=51 page=0 chnl=0
char id=85 x=205 y=73 width=50 height=61 xoffset=-4 yoffset=2 xadvance=57 page=0 chnl=0
char id=86 x=50 y=195 width=57 height=60 xoffset=-9 yoffset=2 xadvance=54 page=0 chnl=0
char id=87 x=107 y=195 width=73 height=60 xoffset=-8 yoffset=2 xadvance=72 page=0 chnl=0
char id=88 x=180 y=195 width=55 height=60 xoffset=-9 yoffset=2 xadvance=53 page=0 chnl=0
char id=89 x=235 y=195 width=55 height=60 xoffset=-9 yoffset=2 xadvance=53 page=0 chnl=0
char id=90 x=290 y=195 width=51 height=60 xoffset=-8 yoffset=2 xadvance=51 page=0 chnl=0
char id=91 x=192 y=0 width=30 height=71 xoffset=-5 yoffset=2 xadvance=32 page=0 chnl=0
char id=92 x=242 y=255 width=35 height=60 xoffset=-9 yoffset=2 xadvance=32 page=0 chnl=0
char id=93 x=222 y=0 width=30 height=71 xoffset=-8 yoffset=2 xadvance=32 page=0 chnl=0
char id=94 x=268 y=424 width=41 height=41 xoffset=-8 yoffset=1 xadvance=40 page=0 chnl=0
char id=95 x=106 y=473 width=52 height=24 xoffset=-10 yoffset=49 xadvance=48 page=0 chnl=0
char id=96 x=473 y=424 width=28 height=27 xoffset=-7 yoffset=2 xadvance=35 page=0 chnl=0
char id=97 x=0 y=374 width=46 height=50 xoffset=-7 yoffset=12 xadvance=48 page=0 chnl=0
char id=98 x=341 y=195 width=45 height=60 xoffset=-5 yoffset=2 xadvance=48 page=0 chnl=0
char id=99 x=46 y=374 width=45 height=50 xoffset=-7 yoffset=12 xadvance=45 page=0 chnl=0
char id=100 x=386 y=195 width=45 height=60 xoffset=-7 yoffset=2 xadvance=48 page=0 chnl=0
char id=101 x=91 y=374 width=47 height=50 xoffset=-7 yoffset=12 xadvance=48 page=0 chnl=0
char id=102 x=431 y=195 width=36 height=60 xoffset=-8 yoffset=2 xadvance=32 page=0 chnl=0
char id=103 x=255 y=73 width=45 height=61 xoffset=-7 yoffset=12 xadvance=48 page=0 chnl=0
char id=104 x=467 y=195 width=43 height=60 xoffset=-5 yoffset=2 xadvance=48 page=0 chnl=0
char id=105 x=0 y=255 width=24 height=60 xoffset=-5 yoffset=2 xadvance=29 page=0 chnl=0
char id=106 x=94 y=0 width=33 height=71 xoffset=-12 yoffset=2 xadvance=29 page=0 chnl=0
char id=107 x=24 y=255 width=43 height=60 xoffset=-5 yoffset=2 xadvance=46 page=0 chnl=0
char id=108 x=67 y=255 width=24 height=60 xoffset=-5 yoffset=2 xadvance=29 page=0 chnl=0
char id=109 x=138 y=374 width=60 height=50 xoffset=-5 yoffset=12 xadvance=65 page=0 chnl=0
char id=110 x=198 y=374 width=43 height=50 xoffset=-5 yoffset=12 xadvance=48 page=0 chnl=0
char id=111 x=241 y=374 width=47 height=50 xoffset=-7 yoffset=12 xadvance=48 page=0 chnl=0
char id=112 x=300 y=73 width=45 height=61 xoffset=-5 yoffset=12 xadvance=48 page=0 chnl=0
char id=113 x=345 y=73 width=45 height=61 xoffset=-7 yoffset=12 xadvance=48 page=0 chnl=0
char id=114 x=332 y=374 width=34 height=49 xoffset=-5 yoffset=13 xadvance=35 page=0 chnl=0
char id=115 x=288 y=374 width=44 height=50 xoffset=-7 yoffset=12 xadvance=45 page=0 chnl=0
char id=116 x=389 y=255 width=33 height=59 xoffset=-8 yoffset=3 xadvance=32 page=0 chnl=0
char id=117 x=366 y=374 width=43 height=49 xoffset=-5 yoffset=13 xadvance=48 page=0 chnl=0
char id=118 x=409 y=374 width=45 height=49 xoffset=-8 yoffset=13 xadvance=45 page=0 chnl=0
char id=119 x=0 y=424 width=61 height=49 xoffset=-10 yoffset=13 xadvance=57 page=0 chnl=0
char id=120 x=454 y=374 width=46 height=49 xoffset=-9 yoffset=13 xadvance=44 page=0 chnl=0
char id=121 x=91 y=255 width=47 height=60 xoffset=-9 yoffset=13 xadvance=43 page=0 chnl=0
char id=122 x=61 y=424 width=45 height=49 xoffset=-8 yoffset=13 xadvance=44 page=0 chnl=0
char id=123 x=252 y=0 width=36 height=71 xoffset=-8 yoffset=2 xadvance=35 page=0 chnl=0
char id=124 x=0 y=0 width=23 height=73 xoffset=-4 yoffset=2 xadvance=30 page=0 chnl=0
char id=125 x=288 y=0 width=36 height=71 xoffset=-8 yoffset=2 xadvance=35 page=0 chnl=0
char id=126 x=0 y=473 width=47 height=29 xoffset=-7 yoffset=18 xadvance=49 page=0 chnl=0
kernings count=96
kerning first=118 second=44 amount=-4
kerning first=49 second=49 amount=-4
kerning first=87 second=58 amount=-1
kerning first=80 second=65 amount=-4
kerning first=84 second=79 amount=-1
kerning first=65 second=87 amount=-2
kerning first=82 second=86 amount=-1
kerning first=76 second=87 amount=-4
kerning first=86 second=105 amount=-1
kerning first=89 second=97 amount=-4
kerning first=84 second=99 amount=-6
kerning first=86 second=101 amount=-3
kerning first=102 second=102 amount=-1
kerning first=84 second=105 amount=-2
kerning first=84 second=111 amount=-6
kerning first=89 second=112 amount=-4
kerning first=89 second=113 amount=-5
kerning first=84 second=114 amount=-2
kerning first=84 second=115 amount=-6
kerning first=87 second=117 amount=-1
kerning first=89 second=118 amount=-3
kerning first=65 second=119 amount=-1
kerning first=84 second=121 amount=-3
kerning first=87 second=45 amount=-1
kerning first=86 second=121 amount=-2
kerning first=89 second=44 amount=-7
kerning first=65 second=32 amount=-3
kerning first=86 second=44 amount=-5
kerning first=89 second=105 amount=-2
kerning first=86 second=111 amount=-3
kerning first=76 second=32 amount=-2
kerning first=80 second=46 amount=-7
kerning first=70 second=44 amount=-6
kerning first=84 second=97 amount=-6
kerning first=84 second=32 amount=-1
kerning first=84 second=58 amount=-6
kerning first=89 second=111 amount=-5
kerning first=80 second=44 amount=-7
kerning first=65 second=86 amount=-4
kerning first=89 second=101 amount=-5
kerning first=76 second=86 amount=-4
kerning first=86 second=59 amount=-2
kerning first=86 second=117 amount=-2
kerning first=118 second=46 amount=-4
kerning first=89 second=117 amount=-3
kerning first=86 second=65 amount=-4
kerning first=89 second=58 amount=-3
kerning first=65 second=84 amount=-4
kerning first=82 second=84 amount=-1
kerning first=86 second=58 amount=-2
kerning first=119 second=44 amount=-3
kerning first=121 second=46 amount=-4
kerning first=89 second=65 amount=-4
kerning first=84 second=101 amount=-6
kerning first=32 second=84 amount=-1
kerning first=70 second=46 amount=-6
kerning first=86 second=97 amount=-4
kerning first=82 second=89 amount=-1
kerning first=80 second=32 amount=-1
kerning first=87 second=111 amount=-1
kerning first=84 second=117 amount=-2
kerning first=65 second=121 amount=-1
kerning first=87 second=114 amount=-1
kerning first=87 second=101 amount=-1
kerning first=84 second=46 amount=-6
kerning first=84 second=59 amount=-6
kerning first=32 second=89 amount=-1
kerning first=70 second=65 amount=-3
kerning first=87 second=121 amount=-1
kerning first=76 second=121 amount=-2
kerning first=89 second=59 amount=-4
kerning first=84 second=65 amount=-4
kerning first=121 second=44 amount=-4
kerning first=87 second=46 amount=-3
kerning first=114 second=44 amount=-3
kerning first=87 second=65 amount=-2
kerning first=119 second=46 amount=-3
kerning first=87 second=44 amount=-3
kerning first=86 second=45 amount=-3
kerning first=89 second=32 amount=-1
kerning first=89 second=45 amount=-5
kerning first=86 second=46 amount=-5
kerning first=76 second=84 amount=-4
kerning first=84 second=44 amount=-6
kerning first=65 second=89 amount=-4
kerning first=82 second=87 amount=-1
kerning first=87 second=59 amount=-1
kerning first=32 second=65 amount=-3
kerning first=89 second=46 amount=-7
kerning first=84 second=119 amount=-3
kerning first=87 second=97 amount=-2
kerning first=65 second=118 amount=-1
kerning first=86 second=114 amount=-2
kerning first=114 second=46 amount=-3
kerning first=76 second=89 amount=-4
kerning first=84 second=45 amount=-3

Binary file not shown.

After

Width:  |  Height:  |  Size: 128 KiB

BIN
target/classes/icon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 51 KiB

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,29 @@
#version 400
in vec2 textureCoords;
out vec4 out_Colour;
uniform sampler2D colourTexture;
const float brightness = 1.2;
const float contrast = 0.1;
const float saturation = 1.65;
void main(void){
out_Colour = texture(colourTexture, textureCoords);
// calculate saturation
vec3 luminanceWeights = vec3(0.299, 0.587, 0.114);
float luminance = dot(out_Colour.rgb, luminanceWeights);
out_Colour = mix(vec4(luminance), out_Colour, saturation);
// calculate contrast
out_Colour.rgb = (out_Colour.rgb - 0.5) * (1.0 + contrast) + 0.5;
// calculate brightness
out_Colour.rgb *= brightness;
}

View File

@ -0,0 +1,12 @@
#version 400
in vec2 position;
out vec2 textureCoords;
void main(void){
gl_Position = vec4(position, 0.0, 1.0);
textureCoords = position * 0.5 + 0.5;
}

View File

@ -0,0 +1,53 @@
#version 140
in vec2 pass_textureCoords;
in vec3 surfaceNormal;
in vec3 toLightVector[5];
in vec3 toCameraVector;
in float visibility;
out vec4 out_Color;
uniform sampler2D textureSampler;
uniform vec3 lightColour[5];
uniform vec3 attenuation[5];
uniform float shineDamper;
uniform float reflectivity;
uniform vec3 skyColour;
void main(void){
float brightness = 3;
vec3 unitNormal = normalize(surfaceNormal);
vec3 unitVectorToCamera = normalize(toCameraVector);
vec3 totalDiffuse = vec3(0.0);
vec3 totalSpecular = vec3(0.0);
for(int i=0;i<5;i++){
float distance = length(toLightVector[i]);
float attFactor = attenuation[i].x + (attenuation[i].y * distance) + (attenuation[i].z * distance * distance);
vec3 unitLightVector = normalize(toLightVector[i]);
float nDotl = dot(unitNormal, unitLightVector);
float brightness = max(nDotl, 0.0);
vec3 lightDirection = -unitLightVector;
vec3 reflectedLightDirection = reflect(lightDirection, unitNormal);
float specularFactor = dot(reflectedLightDirection, unitVectorToCamera);
specularFactor = max(specularFactor, 0.0);
float dampedFactor = pow(specularFactor, shineDamper);
totalDiffuse = totalDiffuse + (brightness * lightColour[i])/attFactor;
totalSpecular = totalSpecular + (dampedFactor * reflectivity * lightColour[i])/attFactor;
}
totalDiffuse = max(totalDiffuse, 0.2);
vec4 textureColour = texture(textureSampler, pass_textureCoords);
if(textureColour.a<0.5){
discard;
}
out_Color = vec4(totalDiffuse, 1.0) * textureColour + vec4(totalSpecular, 1.0);
out_Color = mix(vec4(skyColour, 1.0), out_Color, visibility);
out_Color = vec4(out_Color.r*brightness, out_Color.g*brightness, out_Color.b*brightness, out_Color.a);
}

View File

@ -0,0 +1,51 @@
#version 150
in vec3 position;
in vec2 textureCoords;
in vec3 normal;
out vec2 pass_textureCoords;
out vec3 surfaceNormal;
out vec3 toLightVector[5];
out vec3 toCameraVector;
out float visibility;
uniform mat4 transformationMatrix;
uniform mat4 projectionMatrix;
uniform mat4 viewMatrix;
uniform vec3 lightPosition[5];
const vec4 plane = vec4(0, -1, 0, 15);
uniform float useFakeLighting;
const float density = 0.025;
const float gradient = 3.0;
void main(void){
vec4 worldPosition = transformationMatrix * vec4(position.xyz,1.0);
gl_ClipDistance[0] = dot(worldPosition, plane);
vec4 positionRelativeToCam = viewMatrix * worldPosition;
gl_Position = projectionMatrix * positionRelativeToCam;
pass_textureCoords = textureCoords;
vec3 actualNormal = normal;
actualNormal = vec3(0.0, 1.0, 0.0);
surfaceNormal = (transformationMatrix * vec4(actualNormal, 0.0)).xyz;
for(int i=0;i<5;i++){
toLightVector[i] = lightPosition[i] - worldPosition.xyz;
}
toCameraVector = (inverse(viewMatrix) * vec4(0.0, 0.0, 0.0, 1.0)).xyz - worldPosition.xyz;
float distance = length(positionRelativeToCam.xyz);
visibility = exp(-pow((distance*density), gradient));
visibility = clamp(visibility, 0.0, 1.0);
}

View File

@ -0,0 +1,33 @@
#version 330
in vec2 pass_textureCoords;
out vec4 out_colour;
uniform vec3 colour;
uniform sampler2D fontAtlas;
const float width = 0;
const float edge = 1.0;
uniform float borderWidth;
uniform float borderEdge;
uniform vec2 offset;
uniform vec3 outlineColour;
void main(void){
float distance = 1.0 - texture(fontAtlas, pass_textureCoords).a;
float alpha = 1.0 - smoothstep(width, width + edge, distance);
float distance2 = 1.0 - texture(fontAtlas, pass_textureCoords + offset).a;
float outlineAlpha = 1.0 - smoothstep(borderWidth, borderWidth + borderEdge, distance2);
float overallAlpha = alpha + (1.0 - alpha) * outlineAlpha;
vec3 overallColour = mix(outlineColour, colour, alpha / overallAlpha);
out_colour = vec4(overallColour, overallAlpha);
}

View File

@ -0,0 +1,15 @@
#version 330
in vec2 position;
in vec2 textureCoords;
out vec2 pass_textureCoords;
uniform vec2 translation;
void main(void){
gl_Position = vec4(position, 0.0, 1.0);
pass_textureCoords = textureCoords;
}

View File

@ -0,0 +1,13 @@
#version 140
in vec2 textureCoords;
out vec4 out_Color;
uniform sampler2D guiTexture;
void main(void){
out_Color = texture(guiTexture,textureCoords);
}

View File

@ -0,0 +1,13 @@
#version 140
in vec2 position;
out vec2 textureCoords;
uniform mat4 transformationMatrix;
void main(void){
gl_Position = transformationMatrix * vec4(position, 0.0, 1.0);
textureCoords = vec2((position.x+1.0)/2.0, 1 - (position.y+1.0)/2.0);
}

View File

@ -0,0 +1,52 @@
#version 400
in vec2 pass_textureCoordinates;
in vec3 toLightVector[4];
in vec3 toCameraVector;
in float visibility;
out vec4 out_Color;
uniform sampler2D modelTexture;
uniform sampler2D normalMap;
uniform vec3 lightColour[4];
uniform vec3 attenuation[4];
uniform float shineDamper;
uniform float reflectivity;
uniform vec3 skyColour;
void main(void){
vec4 normalMapValue = 2.0 * texture(normalMap, pass_textureCoordinates) - 1.0;
vec3 unitNormal = normalize(normalMapValue.rgb);
vec3 unitVectorToCamera = normalize(toCameraVector);
vec3 totalDiffuse = vec3(0.0);
vec3 totalSpecular = vec3(0.0);
for(int i=0;i<4;i++){
float distance = length(toLightVector[i]);
float attFactor = attenuation[i].x + (attenuation[i].y * distance) + (attenuation[i].z * distance * distance);
vec3 unitLightVector = normalize(toLightVector[i]);
float nDotl = dot(unitNormal,unitLightVector);
float brightness = max(nDotl,0.0);
vec3 lightDirection = -unitLightVector;
vec3 reflectedLightDirection = reflect(lightDirection,unitNormal);
float specularFactor = dot(reflectedLightDirection , unitVectorToCamera);
specularFactor = max(specularFactor,0.0);
float dampedFactor = pow(specularFactor,shineDamper);
totalDiffuse = totalDiffuse + (brightness * lightColour[i])/attFactor;
totalSpecular = totalSpecular + (dampedFactor * reflectivity * lightColour[i])/attFactor;
}
totalDiffuse = max(totalDiffuse, 0.2);
vec4 textureColour = texture(modelTexture,pass_textureCoordinates);
if(textureColour.a<0.5){
discard;
}
out_Color = vec4(totalDiffuse,1.0) * textureColour + vec4(totalSpecular,1.0);
out_Color = mix(vec4(skyColour,1.0),out_Color, visibility);
}

View File

@ -0,0 +1,60 @@
#version 400
in vec3 position;
in vec2 textureCoordinates;
in vec3 normal;
in vec3 tangent;
out vec2 pass_textureCoordinates;
out vec3 toLightVector[4];
out vec3 toCameraVector;
out float visibility;
out vec3 pass_tangent;
uniform mat4 transformationMatrix;
uniform mat4 projectionMatrix;
uniform mat4 viewMatrix;
uniform vec3 lightPositionEyeSpace[4];
uniform float numberOfRows;
uniform vec2 offset;
const float density = 0;
const float gradient = 5.0;
uniform vec4 plane;
void main(void){
vec4 worldPosition = transformationMatrix * vec4(position,1.0);
gl_ClipDistance[0] = dot(worldPosition, plane);
mat4 modelViewMatrix = viewMatrix * transformationMatrix;
vec4 positionRelativeToCam = modelViewMatrix * vec4(position,1.0);
gl_Position = projectionMatrix * positionRelativeToCam;
pass_textureCoordinates = (textureCoordinates);
vec3 surfaceNormal = (modelViewMatrix * vec4(normal,0.0)).xyz;
vec3 norm = normalize(surfaceNormal);
vec3 tang = normalize((modelViewMatrix * vec4(tangent, 0.0)).xyz);
vec3 bitang = normalize(cross(norm, tang));
mat3 toTangentSpace = mat3(
tang.x, bitang.x, norm.x,
tang.y, bitang.y, norm.y,
tang.z, bitang.z, norm.z
);
for(int i=0;i<4;i++){
toLightVector[i] = toTangentSpace * (lightPositionEyeSpace[i] - positionRelativeToCam.xyz);
}
toCameraVector = toTangentSpace * (-positionRelativeToCam.xyz);
float distance = length(positionRelativeToCam.xyz);
visibility = exp(-pow((distance*density),gradient));
visibility = clamp(visibility,0.0,1.0);
}

View File

@ -0,0 +1,18 @@
#version 140
out vec4 out_colour;
in vec2 textureCoords1;
in vec2 textureCoords2;
in float blend;
uniform sampler2D particleTexture;
void main(void){
vec4 colour1 = texture(particleTexture, textureCoords1);
vec4 colour2 = texture(particleTexture, textureCoords2);
out_colour = mix(colour1, colour2, blend);
}

View File

@ -0,0 +1,29 @@
#version 140
in vec2 position;
in mat4 modelViewMatrix;
in vec4 texOffsets;
in float blendFactor;
out vec2 textureCoords1;
out vec2 textureCoords2;
out float blend;
uniform mat4 projectionMatrix;
uniform float numberOfRows;
void main(void){
vec2 textureCoords = position + vec2(0.5, 0.5);
textureCoords.y = 1.0 - textureCoords.y;
textureCoords /= numberOfRows;
textureCoords1 = textureCoords + texOffsets.xy;
textureCoords2 = textureCoords + texOffsets.zw;
blend = blendFactor;
gl_Position = projectionMatrix * modelViewMatrix * vec4(position, 0.0, 1.0);
}

View File

@ -0,0 +1,16 @@
#version 400
in vec2 textureCoords;
out vec4 out_Colour;
uniform sampler2D modelTexture;
void main(void){
float alpha = texture(modelTexture, textureCoords).a;
if(alpha < 0.4){
discard;
}
out_Colour = vec4(1.0, 1.0, 1.0, 0.1);
}

View File

@ -0,0 +1,16 @@
#version 150
in vec3 in_position;
in vec2 in_textureCoords;
out vec2 textureCoords;
uniform mat4 mvpMatrix;
void main(void){
textureCoords = in_textureCoords;
gl_Position = mvpMatrix * vec4(in_position, 1.0);
}

View File

@ -0,0 +1,10 @@
#version 400
in vec3 textureCoords;
out vec4 out_Color;
uniform samplerCube cubeMap;
void main(void){
out_Color = texture(cubeMap, textureCoords);
}

View File

@ -0,0 +1,14 @@
#version 400
in vec3 position;
out vec3 textureCoords;
uniform mat4 projectionMatrix;
uniform mat4 viewMatrix;
void main(void){
gl_Position = projectionMatrix * viewMatrix * vec4(position, 1.0);
textureCoords = position;
}

View File

@ -0,0 +1,87 @@
#version 400 core
in vec2 pass_textureCoords;
in vec3 surfaceNormal;
in vec3 toLightVector[5];
in vec3 toCameraVector;
in float visibility;
in vec4 shadowCoords;
out vec4 out_Color;
uniform sampler2D backgroundTexture;
uniform sampler2D rTexture;
uniform sampler2D gTexture;
uniform sampler2D bTexture;
uniform sampler2D blendMap;
uniform sampler2D shadowMap;
uniform vec3 attenuation[5];
uniform vec3 lightColour[5];
const float shineDamper = 0;
const float reflectivity = 0;
uniform vec3 skyColour;
//TODO: multiple tasks
const int pcfCount = 2; // sampling count make a uniform and changeble
const float totalTexels = (pcfCount * 2.0 + 1.0) * (pcfCount * 2.0 + 1.0);
void main(void){
float mapSize = 5120.0; //make a uniform so it matches the java variable
float texelSize = 1.0 / mapSize;
float total = 0.0;
for(int x=-pcfCount; x<=pcfCount; x++){
for(int y=-pcfCount; y<=pcfCount; y++){
float objectNearestLight = texture(shadowMap, shadowCoords.xy + vec2(x,y) * texelSize).r;
if(shadowCoords.z > objectNearestLight){
total+=1.0;
}
}
}
total /= totalTexels;
float lightFactor = 1.0 - (total * shadowCoords.w);
vec4 blendMapColour = texture(blendMap, pass_textureCoords);
vec3 unitVectorToCamera = normalize(toCameraVector);
float backTextureAmount = 1 - (blendMapColour.r + blendMapColour.g + blendMapColour.b);
vec2 tiledCoords = pass_textureCoords * 40.0;
vec4 backgroundTextureColour = texture(backgroundTexture, tiledCoords) * backTextureAmount;
vec4 rTextureColour = texture(rTexture, tiledCoords) * blendMapColour.r;
vec4 gTextureColour = texture(gTexture, tiledCoords) * blendMapColour.g;
vec4 bTextureColour = texture(bTexture, tiledCoords) * blendMapColour.b;
vec4 totalColour = backgroundTextureColour + rTextureColour + gTextureColour + bTextureColour;
vec3 totalDiffuse = vec3(0.0);
vec3 totalSpecular = vec3(0.0);
for(int i=0;i<5;i++){
float distance = length(toLightVector[i]);
float attFactor = attenuation[i].x + (attenuation[i].y * distance) + (attenuation[i].z * distance * distance);
vec3 unitNormal = normalize(surfaceNormal);
vec3 unitLightVector = normalize(toLightVector[i]);
float nDotl = dot(unitNormal, unitLightVector);
float brightness = max(nDotl, 0.2);
vec3 lightDirection = -unitLightVector;
vec3 reflectedLightDirection = reflect(lightDirection, unitNormal);
float specularFactor = dot(reflectedLightDirection, unitVectorToCamera);
specularFactor = max(specularFactor, 0.0);
float dampedFactor = pow(specularFactor, shineDamper);
totalDiffuse = totalDiffuse + brightness * lightColour[i] / attFactor;
totalSpecular = totalSpecular + dampedFactor * reflectivity * lightColour[i] / attFactor;
}
totalDiffuse = max(totalDiffuse * lightFactor, 0.2);
out_Color = vec4(totalDiffuse, 1.0) * totalColour + vec4(totalSpecular, 1.0);
out_Color = mix(vec4(skyColour, 1.0), out_Color, visibility);
}

View File

@ -0,0 +1,49 @@
#version 150
in vec3 position;
in vec2 textureCoords;
in vec3 normal;
out vec2 pass_textureCoords;
out vec3 surfaceNormal;
out vec3 toLightVector[5];
out vec3 toCameraVector;
out float visibility;
out vec4 shadowCoords;
uniform mat4 transformationMatrix;
uniform mat4 projectionMatrix;
uniform mat4 viewMatrix;
uniform vec3 lightPosition[5];
uniform mat4 toShadowMapSpace;
const float density = 0.01;
const float gradient = 5;
const float shadowDistance = 150.0;
const float transitionDistance = 10.0;
void main(void){
vec4 worldPosition = transformationMatrix * vec4(position.xyz,1.0);
shadowCoords = toShadowMapSpace * worldPosition;
vec4 positionRelativeToCam = viewMatrix * worldPosition;
gl_Position = projectionMatrix * positionRelativeToCam;
pass_textureCoords = textureCoords;
surfaceNormal = (transformationMatrix * vec4(normal, 0.0)).xyz;
for(int i=0;i<5;i++){
toLightVector[i] = lightPosition[i] - worldPosition.xyz;
}
toCameraVector = (inverse(viewMatrix) * vec4(0.0, 0.0, 0.0, 1.0)).xyz - worldPosition.xyz;
float distance = length(positionRelativeToCam.xyz);
visibility = exp(-pow((distance * density), gradient));
visibility = clamp(visibility, 0.0, 1.0);
distance = distance - (shadowDistance - transitionDistance);
distance = distance / transitionDistance;
shadowCoords.w = clamp(1.0-distance, 0.0, 1.0);
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 269 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 370 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 433 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 382 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 329 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 584 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 406 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 557 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 400 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 590 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 411 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 631 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 412 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 417 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 664 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 835 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 566 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 406 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 726 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 438 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 478 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 257 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 301 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 281 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 278 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 289 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 277 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 280 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 268 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 310 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 316 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 296 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 260 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 223 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 232 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 303 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 192 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 204 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 205 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 204 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 204 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 204 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 204 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 204 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 204 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 614 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 204 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 201 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 204 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 580 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 198 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 204 B

View File

@ -0,0 +1,17 @@
[LocalizedFileNames]
concrete_powder_pink.png=@concrete_powder_pink.png,0
concrete_powder_magenta.png=@concrete_powder_magenta.png,0
concrete_powder_lime.png=@concrete_powder_lime.png,0
concrete_powder_light_blue.png=@concrete_powder_light_blue.png,0
concrete_powder_green.png=@concrete_powder_green.png,0
concrete_powder_gray.png=@concrete_powder_gray.png,0
concrete_powder_cyan.png=@concrete_powder_cyan.png,0
concrete_powder_brown.png=@concrete_powder_brown.png,0
concrete_powder_red.png=@concrete_powder_red.png,0
concrete_powder_black.png=@concrete_powder_black.png,0
concrete_powder_white.png=@concrete_powder_white.png,0
concrete_powder_blue.png=@concrete_powder_blue.png,0
concrete_powder_yellow.png=@concrete_powder_yellow.png,0
concrete_powder_silver.png=@concrete_powder_silver.png,0
concrete_powder_orange.png=@concrete_powder_orange.png,0
concrete_powder_purple.png=@concrete_powder_purple.png,0

Binary file not shown.

After

Width:  |  Height:  |  Size: 633 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 305 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 406 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 381 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 608 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 710 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 726 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 813 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 690 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 643 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 665 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 735 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 960 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 957 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 418 B

Some files were not shown because too many files have changed in this diff Show More