Naloga 1
This commit is contained in:
Gašper Dobrovoljc
commit
ff56a51b82
8
.idea/.gitignore
generated
vendored
Normal file
8
.idea/.gitignore
generated
vendored
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
# Default ignored files
|
||||||
|
/shelf/
|
||||||
|
/workspace.xml
|
||||||
|
# Editor-based HTTP Client requests
|
||||||
|
/httpRequests/
|
||||||
|
# Datasource local storage ignored files
|
||||||
|
/dataSources/
|
||||||
|
/dataSources.local.xml
|
||||||
150
.idea/codeStyles/Project.xml
generated
Normal file
150
.idea/codeStyles/Project.xml
generated
Normal file
@ -0,0 +1,150 @@
|
|||||||
|
<component name="ProjectCodeStyleConfiguration">
|
||||||
|
<code_scheme name="Project" version="173">
|
||||||
|
<HTMLCodeStyleSettings>
|
||||||
|
<option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" />
|
||||||
|
</HTMLCodeStyleSettings>
|
||||||
|
<JSCodeStyleSettings version="0">
|
||||||
|
<option name="FORCE_SEMICOLON_STYLE" value="true" />
|
||||||
|
<option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
|
||||||
|
<option name="FORCE_QUOTE_STYlE" value="true" />
|
||||||
|
<option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
|
||||||
|
<option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
|
||||||
|
<option name="SPACES_WITHIN_IMPORTS" value="true" />
|
||||||
|
</JSCodeStyleSettings>
|
||||||
|
<RiderCodeStyleSettings>
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppClangFormat/EnableClangFormatSupport/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/EditorConfig/EnableClangFormatSupport/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ALIGN_MULTILINE_BINARY_EXPRESSIONS_CHAIN/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ALIGN_MULTILINE_CALLS_CHAIN/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ALIGN_MULTILINE_EXPRESSION/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ALIGN_MULTILINE_FOR_STMT/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ALIGN_MULTIPLE_DECLARATION/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ALIGN_TERNARY/@EntryValue" value="ALIGN_ALL" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/BLANK_LINES_AROUND_CLASS_DEFINITION/@EntryValue" value="1" type="int" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/KEEP_BLANK_LINES_IN_DECLARATIONS/@EntryValue" value="2" type="int" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/KEEP_BLANK_LINES_IN_CODE/@EntryValue" value="2" type="int" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/KEEP_USER_LINEBREAKS/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/INDENT_CASE_FROM_SWITCH/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/INDENT_COMMENT/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/INT_ALIGN_EQ/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SIMPLE_BLOCK_STYLE/@EntryValue" value="DO_NOT_CHANGE" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_COMMA_IN_TEMPLATE_ARGS/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_COMMA_IN_TEMPLATE_PARAMS/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_FOR_SEMICOLON/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_FOR_SEMICOLON/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_UNARY_OPERATOR/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_WITHIN_ARRAY_ACCESS_BRACKETS/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_WITHIN_CAST_EXPRESSION_PARENTHESES/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_WITHIN_EMPTY_INITIALIZER_BRACES/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_WITHIN_EMPTY_METHOD_PARENTHESES/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_WITHIN_INITIALIZER_BRACES/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPECIAL_ELSE_IF_TREATMENT/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_CAST_EXPRESSION_PARENTHESES/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/WRAP_AFTER_BINARY_OPSIGN/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/WRAP_BEFORE_TERNARY_OPSIGNS/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/TYPE_DECLARATION_BRACES/@EntryValue" value="END_OF_LINE" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/OTHER_BRACES/@EntryValue" value="END_OF_LINE" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/CASE_BLOCK_BRACES/@EntryValue" value="END_OF_LINE" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/BLANK_LINES_AROUND_FUNCTION_DECLARATION/@EntryValue" value="1" type="int" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/BLANK_LINES_AROUND_FUNCTION_DEFINITION/@EntryValue" value="1" type="int" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/PLACE_WHILE_ON_NEW_LINE/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/PLACE_ELSE_ON_NEW_LINE/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/PLACE_CATCH_ON_NEW_LINE/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/NAMESPACE_INDENTATION/@EntryValue" value="All" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ALIGN_MULTILINE_ARGUMENT/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ALIGN_MULTILINE_EXTENDS_LIST/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ALIGN_MULTILINE_PARAMETER/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ALIGN_MULTILINE_TYPE_ARGUMENT/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ALIGN_MULTILINE_TYPE_PARAMETER/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/BLANK_LINES_AROUND_DECLARATIONS/@EntryValue" value="0" type="int" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/INDENT_ACCESS_SPECIFIERS_FROM_CLASS/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/INDENT_CLASS_MEMBERS_FROM_ACCESS_SPECIFIERS/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/LINE_BREAK_AFTER_COLON_IN_MEMBER_INITIALIZER_LISTS/@EntryValue" value="ON_SINGLE_LINE" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/MEMBER_INITIALIZER_LIST_STYLE/@EntryValue" value="DO_NOT_CHANGE" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/PLACE_NAMESPACE_DEFINITIONS_ON_SAME_LINE/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_COLON_IN_BITFIELD_DECLARATOR/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_COLON_IN_BITFIELD_DECLARATOR/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_EXTENDS_COLON/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_EXTENDS_COLON/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_FOR_COLON/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_FOR_COLON/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_PTR_IN_DATA_MEMBER/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_PTR_IN_DATA_MEMBERS/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_PTR_IN_METHOD/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_PTR_IN_NESTED_DECLARATOR/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_REF_IN_DATA_MEMBER/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_REF_IN_DATA_MEMBERS/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_REF_IN_METHOD/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_PTR_IN_ABSTRACT_DECL/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_PTR_IN_DATA_MEMBER/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_PTR_IN_DATA_MEMBERS/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_PTR_IN_METHOD/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_REF_IN_ABSTRACT_DECL/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_REF_IN_DATA_MEMBER/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_REF_IN_DATA_MEMBERS/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_REF_IN_METHOD/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_TEMPLATE_ARGS/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_TEMPLATE_PARAMS/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BETWEEN_CLOSING_ANGLE_BRACKETS_IN_TEMPLATE_ARGS/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_WITHIN_EMPTY_TEMPLATE_PARAMS/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_WITHIN_TEMPLATE_ARGS/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_WITHIN_TEMPLATE_PARAMS/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_WITHIN_DECLARATION_PARENTHESES/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_WITHIN_EMPTY_BLOCKS/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/WRAP_BEFORE_INVOCATION_LPAR/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/WRAP_AFTER_INVOCATION_LPAR/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/WRAP_BEFORE_INVOCATION_RPAR/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/WRAP_BEFORE_DECLARATION_LPAR/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/WRAP_AFTER_DECLARATION_LPAR/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/WRAP_BEFORE_DECLARATION_RPAR/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/WRAP_ARGUMENTS_STYLE/@EntryValue" value="WRAP_IF_LONG" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/WRAP_PARAMETERS_STYLE/@EntryValue" value="WRAP_IF_LONG" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/BREAK_TEMPLATE_DECLARATION/@EntryValue" value="LINE_BREAK" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/NAMESPACE_DECLARATION_BRACES/@EntryValue" value="END_OF_LINE" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/FREE_BLOCK_BRACES/@EntryValue" value="END_OF_LINE" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/INVOCABLE_DECLARATION_BRACES/@EntryValue" value="END_OF_LINE" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ANONYMOUS_METHOD_DECLARATION_BRACES/@EntryValue" value="END_OF_LINE" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/INITIALIZER_BRACES/@EntryValue" value="END_OF_LINE_NO_SPACE" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/INDENT_STYLE/@EntryValue" value="Space" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/INDENT_SIZE/@EntryValue" value="4" type="int" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/CONTINUOUS_LINE_INDENT/@EntryValue" value="Double" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/TAB_WIDTH/@EntryValue" value="4" type="int" />
|
||||||
|
</RiderCodeStyleSettings>
|
||||||
|
<TypeScriptCodeStyleSettings version="0">
|
||||||
|
<option name="FORCE_SEMICOLON_STYLE" value="true" />
|
||||||
|
<option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
|
||||||
|
<option name="FORCE_QUOTE_STYlE" value="true" />
|
||||||
|
<option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
|
||||||
|
<option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
|
||||||
|
<option name="SPACES_WITHIN_IMPORTS" value="true" />
|
||||||
|
</TypeScriptCodeStyleSettings>
|
||||||
|
<VueCodeStyleSettings>
|
||||||
|
<option name="INTERPOLATION_NEW_LINE_AFTER_START_DELIMITER" value="false" />
|
||||||
|
<option name="INTERPOLATION_NEW_LINE_BEFORE_END_DELIMITER" value="false" />
|
||||||
|
</VueCodeStyleSettings>
|
||||||
|
<codeStyleSettings language="HTML">
|
||||||
|
<option name="SOFT_MARGINS" value="80" />
|
||||||
|
<indentOptions>
|
||||||
|
<option name="CONTINUATION_INDENT_SIZE" value="4" />
|
||||||
|
</indentOptions>
|
||||||
|
</codeStyleSettings>
|
||||||
|
<codeStyleSettings language="JavaScript">
|
||||||
|
<option name="SOFT_MARGINS" value="80" />
|
||||||
|
</codeStyleSettings>
|
||||||
|
<codeStyleSettings language="TypeScript">
|
||||||
|
<option name="SOFT_MARGINS" value="80" />
|
||||||
|
</codeStyleSettings>
|
||||||
|
<codeStyleSettings language="Vue">
|
||||||
|
<option name="SOFT_MARGINS" value="80" />
|
||||||
|
<indentOptions>
|
||||||
|
<option name="INDENT_SIZE" value="4" />
|
||||||
|
<option name="TAB_SIZE" value="4" />
|
||||||
|
</indentOptions>
|
||||||
|
</codeStyleSettings>
|
||||||
|
<codeStyleSettings language="go">
|
||||||
|
<indentOptions>
|
||||||
|
<option name="SMART_TABS" value="true" />
|
||||||
|
</indentOptions>
|
||||||
|
</codeStyleSettings>
|
||||||
|
</code_scheme>
|
||||||
|
</component>
|
||||||
5
.idea/codeStyles/codeStyleConfig.xml
generated
Normal file
5
.idea/codeStyles/codeStyleConfig.xml
generated
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
<component name="ProjectCodeStyleConfiguration">
|
||||||
|
<state>
|
||||||
|
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
|
||||||
|
</state>
|
||||||
|
</component>
|
||||||
12
.idea/inspectionProfiles/Project_Default.xml
generated
Normal file
12
.idea/inspectionProfiles/Project_Default.xml
generated
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
<component name="InspectionProjectProfileManager">
|
||||||
|
<profile version="1.0">
|
||||||
|
<option name="myName" value="Project Default" />
|
||||||
|
<inspection_tool class="PyUnresolvedReferencesInspection" enabled="true" level="WARNING" enabled_by_default="true">
|
||||||
|
<option name="ignoredIdentifiers">
|
||||||
|
<list>
|
||||||
|
<option value="tests.smoke.test_absences_sliding.TestAbsencesSliding.*" />
|
||||||
|
</list>
|
||||||
|
</option>
|
||||||
|
</inspection_tool>
|
||||||
|
</profile>
|
||||||
|
</component>
|
||||||
8
.idea/modules.xml
generated
Normal file
8
.idea/modules.xml
generated
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="ProjectModuleManager">
|
||||||
|
<modules>
|
||||||
|
<module fileurl="file://$PROJECT_DIR$/.idea/rg.iml" filepath="$PROJECT_DIR$/.idea/rg.iml" />
|
||||||
|
</modules>
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
12
.idea/rg.iml
generated
Normal file
12
.idea/rg.iml
generated
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<module type="WEB_MODULE" version="4">
|
||||||
|
<component name="NewModuleRootManager">
|
||||||
|
<content url="file://$MODULE_DIR$">
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/.tmp" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/temp" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/tmp" />
|
||||||
|
</content>
|
||||||
|
<orderEntry type="inheritedJdk" />
|
||||||
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
|
</component>
|
||||||
|
</module>
|
||||||
6
.idea/vcs.xml
generated
Normal file
6
.idea/vcs.xml
generated
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="VcsDirectoryMappings">
|
||||||
|
<mapping directory="$PROJECT_DIR$" vcs="Git" />
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
5
naloga_1/.prettierrc
Normal file
5
naloga_1/.prettierrc
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
{
|
||||||
|
"semi": true,
|
||||||
|
"trailingComma": "all",
|
||||||
|
"tabWidth": 4
|
||||||
|
}
|
||||||
13
naloga_1/index.html
Normal file
13
naloga_1/index.html
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
<!doctype html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<title>Domača Naloga 1</title>
|
||||||
|
|
||||||
|
<script defer src="script.js"></script>
|
||||||
|
</head>
|
||||||
|
<body style="margin: 0; padding: 0;">
|
||||||
|
<canvas id="canvas" width="512px" height="512px"></canvas>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
169
naloga_1/script.js
Normal file
169
naloga_1/script.js
Normal file
@ -0,0 +1,169 @@
|
|||||||
|
async function main() {
|
||||||
|
const canvas = document.getElementById("canvas");
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @type RenderingContext
|
||||||
|
*/
|
||||||
|
const ctx = canvas.getContext("2d");
|
||||||
|
|
||||||
|
const { models, scene } = await fetch("test.json").then(res => res.json());
|
||||||
|
|
||||||
|
for (const { model, transforms } of scene) {
|
||||||
|
let m = Matrix.identity();
|
||||||
|
|
||||||
|
for (const transform of transforms) {
|
||||||
|
switch (transform.type) {
|
||||||
|
case "scale":
|
||||||
|
m = m.scale(transform.factor[0], transform.factor[1]);
|
||||||
|
break;
|
||||||
|
case "rotate":
|
||||||
|
m = m.rotate(transform.angle);
|
||||||
|
break;
|
||||||
|
case "translate":
|
||||||
|
m = m.translate(transform.vector[0], transform.vector[1]);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
m = m.screen(0, 0, canvas.width, canvas.height);
|
||||||
|
|
||||||
|
for (const line of models[model]) {
|
||||||
|
const p1 = m.multiply(Matrix.vector(...line[0], 1));
|
||||||
|
ctx.moveTo(p1.vector[0], p1.vector[1]);
|
||||||
|
|
||||||
|
const p2 = m.multiply(Matrix.vector(...line[1], 1));
|
||||||
|
ctx.lineTo(p2.vector[0], p2.vector[1]);
|
||||||
|
}
|
||||||
|
ctx.stroke();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
main();
|
||||||
|
|
||||||
|
class Matrix extends Array {
|
||||||
|
/**
|
||||||
|
* @param {number[][]} matrix
|
||||||
|
*/
|
||||||
|
constructor(matrix) {
|
||||||
|
super();
|
||||||
|
this.push(...matrix);
|
||||||
|
}
|
||||||
|
|
||||||
|
static identity() {
|
||||||
|
return new Matrix([
|
||||||
|
[1, 0, 0],
|
||||||
|
[0, 1, 0],
|
||||||
|
[0, 0, 1],
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param {number} vector
|
||||||
|
*/
|
||||||
|
static vector(...vector) {
|
||||||
|
const matrix = Array(vector.length);
|
||||||
|
for (let i = 0; i < vector.length; i++) {
|
||||||
|
matrix[i] = [vector[i]];
|
||||||
|
}
|
||||||
|
return new Matrix(matrix);
|
||||||
|
}
|
||||||
|
|
||||||
|
get width() {
|
||||||
|
if (this.length === 0) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
return this[0].length;
|
||||||
|
}
|
||||||
|
|
||||||
|
get height() {
|
||||||
|
return this.length;
|
||||||
|
}
|
||||||
|
|
||||||
|
get vector() {
|
||||||
|
const v = [];
|
||||||
|
for (const l of this) {
|
||||||
|
v.push(l[0]);
|
||||||
|
}
|
||||||
|
return v;
|
||||||
|
}
|
||||||
|
|
||||||
|
toString() {
|
||||||
|
let str = "";
|
||||||
|
for (const line of this) {
|
||||||
|
str += line.join(", ") + "\n";
|
||||||
|
}
|
||||||
|
return str;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param {Matrix} matrix
|
||||||
|
*/
|
||||||
|
multiply(matrix) {
|
||||||
|
if (this.width !== matrix.height) {
|
||||||
|
throw Error("Can not multiply");
|
||||||
|
}
|
||||||
|
|
||||||
|
const m = Array.from({ length: this.height },
|
||||||
|
() => Array.from(
|
||||||
|
{ length: matrix.width }, () => 0,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
for (let i = 0; i < m.length; i++) {
|
||||||
|
for (let j = 0; j < m[0].length; j++) {
|
||||||
|
let sum = 0;
|
||||||
|
for (let k = 0; k < this.width; k++) {
|
||||||
|
sum += this[i][k] * matrix[k][j];
|
||||||
|
}
|
||||||
|
m[i][j] = sum;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return new Matrix(m);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param {number} x
|
||||||
|
* @param {number} y
|
||||||
|
*/
|
||||||
|
scale(x, y) {
|
||||||
|
return new Matrix([
|
||||||
|
[x, 0, 0],
|
||||||
|
[0, y, 0],
|
||||||
|
[0, 0, 1],
|
||||||
|
]).multiply(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param {number} angle
|
||||||
|
*/
|
||||||
|
rotate(angle) {
|
||||||
|
return new Matrix([
|
||||||
|
[Math.cos(angle), -Math.sin(angle), 0],
|
||||||
|
[Math.sin(angle), Math.cos(angle), 0],
|
||||||
|
[0, 0, 1],
|
||||||
|
]).multiply(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
translate(x, y) {
|
||||||
|
return new Matrix([
|
||||||
|
[1, 0, x],
|
||||||
|
[0, 1, y],
|
||||||
|
[0, 0, 1],
|
||||||
|
]).multiply(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param {number} x0
|
||||||
|
* @param {number} y0
|
||||||
|
* @param {number} x1
|
||||||
|
* @param {number} y1
|
||||||
|
*/
|
||||||
|
screen(x0, y0, x1, y1) {
|
||||||
|
return new Matrix([
|
||||||
|
[(x1 - x0) / 2, 0, (x0 + x1) / 2],
|
||||||
|
[0, -(y1 - y0) / 2, (y0 + y1) / 2],
|
||||||
|
[0, 0, 1],
|
||||||
|
]).multiply(this);
|
||||||
|
}
|
||||||
|
}
|
||||||
198
naloga_1/test.json
Normal file
198
naloga_1/test.json
Normal file
@ -0,0 +1,198 @@
|
|||||||
|
{
|
||||||
|
"models": [
|
||||||
|
[
|
||||||
|
[[-1, -1], [1, -1]],
|
||||||
|
[[1, -1], [0, 1]],
|
||||||
|
[[0, 1], [-1, -1]]
|
||||||
|
],
|
||||||
|
[
|
||||||
|
[[0, 1], [-0.5878, -0.8090]],
|
||||||
|
[[-0.5878, -0.8090], [0.9511, 0.3090]],
|
||||||
|
[[0.9511, 0.3090], [-0.9511, 0.3090]],
|
||||||
|
[[-0.9511, 0.3090], [0.5878, -0.8090]],
|
||||||
|
[[0.5878, -0.8090], [0, 1]]
|
||||||
|
]
|
||||||
|
],
|
||||||
|
"scene": [
|
||||||
|
{
|
||||||
|
"model": 0,
|
||||||
|
"transforms": [
|
||||||
|
{ "type": "scale", "factor": [0.01, 0.01] },
|
||||||
|
{ "type": "rotate", "angle": 1 },
|
||||||
|
{ "type": "translate", "vector": [0.05, 0] },
|
||||||
|
{ "type": "rotate", "angle": 0.5 }
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"model": 1,
|
||||||
|
"transforms": [
|
||||||
|
{ "type": "scale", "factor": [0.02, 0.02] },
|
||||||
|
{ "type": "rotate", "angle": 2 },
|
||||||
|
{ "type": "translate", "vector": [0.1, 0] },
|
||||||
|
{ "type": "rotate", "angle": 1 }
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"model": 0,
|
||||||
|
"transforms": [
|
||||||
|
{ "type": "scale", "factor": [0.03, 0.03] },
|
||||||
|
{ "type": "rotate", "angle": 3 },
|
||||||
|
{ "type": "translate", "vector": [0.15, 0] },
|
||||||
|
{ "type": "rotate", "angle": 1.5 }
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"model": 1,
|
||||||
|
"transforms": [
|
||||||
|
{ "type": "scale", "factor": [0.04, 0.04] },
|
||||||
|
{ "type": "rotate", "angle": 4 },
|
||||||
|
{ "type": "translate", "vector": [0.2, 0] },
|
||||||
|
{ "type": "rotate", "angle": 2 }
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"model": 0,
|
||||||
|
"transforms": [
|
||||||
|
{ "type": "scale", "factor": [0.05, 0.05] },
|
||||||
|
{ "type": "rotate", "angle": 5 },
|
||||||
|
{ "type": "translate", "vector": [0.25, 0] },
|
||||||
|
{ "type": "rotate", "angle": 2.5 }
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"model": 1,
|
||||||
|
"transforms": [
|
||||||
|
{ "type": "scale", "factor": [0.06, 0.06] },
|
||||||
|
{ "type": "rotate", "angle": 6 },
|
||||||
|
{ "type": "translate", "vector": [0.3, 0] },
|
||||||
|
{ "type": "rotate", "angle": 3 }
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"model": 0,
|
||||||
|
"transforms": [
|
||||||
|
{ "type": "scale", "factor": [0.07, 0.07] },
|
||||||
|
{ "type": "rotate", "angle": 7 },
|
||||||
|
{ "type": "translate", "vector": [0.35, 0] },
|
||||||
|
{ "type": "rotate", "angle": 3.5 }
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"model": 1,
|
||||||
|
"transforms": [
|
||||||
|
{ "type": "scale", "factor": [0.08, 0.08] },
|
||||||
|
{ "type": "rotate", "angle": 8 },
|
||||||
|
{ "type": "translate", "vector": [0.4, 0] },
|
||||||
|
{ "type": "rotate", "angle": 4 }
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"model": 0,
|
||||||
|
"transforms": [
|
||||||
|
{ "type": "scale", "factor": [0.09, 0.09] },
|
||||||
|
{ "type": "rotate", "angle": 9 },
|
||||||
|
{ "type": "translate", "vector": [0.45, 0] },
|
||||||
|
{ "type": "rotate", "angle": 4.5 }
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"model": 1,
|
||||||
|
"transforms": [
|
||||||
|
{ "type": "scale", "factor": [0.1, 0.1] },
|
||||||
|
{ "type": "rotate", "angle": 10 },
|
||||||
|
{ "type": "translate", "vector": [0.5, 0] },
|
||||||
|
{ "type": "rotate", "angle": 5 }
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"model": 0,
|
||||||
|
"transforms": [
|
||||||
|
{ "type": "scale", "factor": [0.11, 0.11] },
|
||||||
|
{ "type": "rotate", "angle": 11 },
|
||||||
|
{ "type": "translate", "vector": [0.55, 0] },
|
||||||
|
{ "type": "rotate", "angle": 5.5 }
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"model": 1,
|
||||||
|
"transforms": [
|
||||||
|
{ "type": "scale", "factor": [0.12, 0.12] },
|
||||||
|
{ "type": "rotate", "angle": 12 },
|
||||||
|
{ "type": "translate", "vector": [0.6, 0] },
|
||||||
|
{ "type": "rotate", "angle": 6 }
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"model": 0,
|
||||||
|
"transforms": [
|
||||||
|
{ "type": "scale", "factor": [0.13, 0.13] },
|
||||||
|
{ "type": "rotate", "angle": 13 },
|
||||||
|
{ "type": "translate", "vector": [0.65, 0] },
|
||||||
|
{ "type": "rotate", "angle": 6.5 }
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"model": 1,
|
||||||
|
"transforms": [
|
||||||
|
{ "type": "scale", "factor": [0.14, 0.14] },
|
||||||
|
{ "type": "rotate", "angle": 14 },
|
||||||
|
{ "type": "translate", "vector": [0.7, 0] },
|
||||||
|
{ "type": "rotate", "angle": 7 }
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"model": 0,
|
||||||
|
"transforms": [
|
||||||
|
{ "type": "scale", "factor": [0.15, 0.15] },
|
||||||
|
{ "type": "rotate", "angle": 15 },
|
||||||
|
{ "type": "translate", "vector": [0.75, 0] },
|
||||||
|
{ "type": "rotate", "angle": 7.5 }
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"model": 1,
|
||||||
|
"transforms": [
|
||||||
|
{ "type": "scale", "factor": [0.16, 0.16] },
|
||||||
|
{ "type": "rotate", "angle": 16 },
|
||||||
|
{ "type": "translate", "vector": [0.8, 0] },
|
||||||
|
{ "type": "rotate", "angle": 8 }
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"model": 0,
|
||||||
|
"transforms": [
|
||||||
|
{ "type": "scale", "factor": [0.17, 0.17] },
|
||||||
|
{ "type": "rotate", "angle": 17 },
|
||||||
|
{ "type": "translate", "vector": [0.85, 0] },
|
||||||
|
{ "type": "rotate", "angle": 8.5 }
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"model": 1,
|
||||||
|
"transforms": [
|
||||||
|
{ "type": "scale", "factor": [0.18, 0.18] },
|
||||||
|
{ "type": "rotate", "angle": 18 },
|
||||||
|
{ "type": "translate", "vector": [0.9, 0] },
|
||||||
|
{ "type": "rotate", "angle": 9 }
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"model": 0,
|
||||||
|
"transforms": [
|
||||||
|
{ "type": "scale", "factor": [0.19, 0.19] },
|
||||||
|
{ "type": "rotate", "angle": 19 },
|
||||||
|
{ "type": "translate", "vector": [0.95, 0] },
|
||||||
|
{ "type": "rotate", "angle": 9.5 }
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"model": 1,
|
||||||
|
"transforms": [
|
||||||
|
{ "type": "scale", "factor": [0.2, 0.2] },
|
||||||
|
{ "type": "rotate", "angle": 20 },
|
||||||
|
{ "type": "translate", "vector": [1, 0] },
|
||||||
|
{ "type": "rotate", "angle": 10 }
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
Loading…
x
Reference in New Issue
Block a user