Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

extra various update #77

Merged
merged 17 commits into from
May 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .extra/GeoGebra/math_test_1.ggb
Binary file not shown.
Binary file added .extra/GeoGebra/unit_circle.ggb
Binary file not shown.
6 changes: 4 additions & 2 deletions unit_circle.html → .extra/GeoGebra/unit_circle.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<iframe src="https://www.geogebra.org/calculator/njbutzru?embed" width="800"
height="100%" allowfullscreen
<iframe src="https://www.geogebra.org/calculator/njbutzru?embed"
width="100%"
height="100%"
allowfullscreen
style="border: 1px solid #e4e4e4;border-radius: 4px;"
frameborder="0">
</iframe>
4 changes: 2 additions & 2 deletions doxyfile → .extra/doxygen/doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -1411,7 +1411,7 @@ HTML_STYLESHEET =
# documentation.
# This tag requires that the tag GENERATE_HTML is set to YES.

HTML_EXTRA_STYLESHEET =
HTML_EXTRA_STYLESHEET = .extra/doxygen/theme/doxygen-awesome.css

# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
# other source files which should be copied to the HTML output directory. Note
Expand Down Expand Up @@ -1762,7 +1762,7 @@ DISABLE_INDEX = NO
# The default value is: NO.
# This tag requires that the tag GENERATE_HTML is set to YES.

GENERATE_TREEVIEW = NO
GENERATE_TREEVIEW = YES

# When both GENERATE_TREEVIEW and DISABLE_INDEX are set to YES, then the
# FULL_SIDEBAR option determines if the side bar is limited to only the treeview
Expand Down
File renamed without changes.
1 change: 1 addition & 0 deletions .extra/doxygen/theme
Submodule theme added at 9f9781
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
<a href="https://www.flaticon.com/free-icons/document" title="document icons">Document icons created by Freepik -
Flaticon</a>
<a href="https://www.flaticon.com/free-icons/document" title="document icons">Document icons created by Freepik - Flaticon</a>
<br> </br>
<a href="https://www.flaticon.com/free-icons/save" title="save icons">Save icons created by Freepik - Flaticon</a>
<br> </br>
<a href="https://www.flaticon.com/free-icons/contract" title="contract icons">Contract icons created by Freepik -
Flaticon</a>
<a href="https://www.flaticon.com/free-icons/contract" title="contract icons">Contract icons created by Freepik - Flaticon</a>
<br> </br>
<a href="https://www.flaticon.com/free-icons/folder" title="folder icons">Folder icons created by Freepik - Flaticon</a>
<br> </br>
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
145 changes: 145 additions & 0 deletions .extra/json/PRESENTATION.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,145 @@
{
"Hills": [
{
"Id": 40000,
"Vertices": [
{
"X": 6.4,
"Y": 6.4
},
{
"X": 2.2,
"Y": -0.6
},
{
"X": 9.7,
"Y": -1.5
},
{
"X": 13.5,
"Y": 4.2
}
]
},
{
"Id": 40001,
"Vertices": [
{
"X": 23.8,
"Y": 9
},
{
"X": 10,
"Y": 16
},
{
"X": 12.4,
"Y": 8.8
}
]
}
],
"Targets": [
{
"Id": 10000,
"X": 5.5,
"Y": 7.7
},
{
"Id": 10001,
"X": 10.2,
"Y": -2.7
},
{
"Id": 10002,
"X": 1.6,
"Y": -1.2
},
{
"Id": 10003,
"X": 13.8,
"Y": 5.6
},
{
"Id": 10004,
"X": 22.5,
"Y": 6.5
},
{
"Id": 10005,
"X": 27,
"Y": 3
},
{
"Id": 10006,
"X": 31,
"Y": 0
},
{
"Id": 10007,
"X": 35,
"Y": -1
},
{
"Id": 10008,
"X": 42,
"Y": 4
},
{
"Id": 10009,
"X": 37.5,
"Y": 10
},
{
"Id": 10010,
"X": 26,
"Y": 14.5
},
{
"Id": 10011,
"X": 19,
"Y": -1.8
},
{
"Id": 10012,
"X": 22,
"Y": 2.4
}
],
"Trappy_Circles": [
{
"Id": 20001,
"Radius": 3,
"X": 30.2,
"Y": 14.3
},
{
"Id": 20000,
"Radius": 1.5,
"X": 29.5,
"Y": 6.7
}
],
"Trappy_Lines": [
{
"Id": 30001,
"Id_P1": 10004,
"Id_P2": 10005
},
{
"Id": 30000,
"Id_P1": 10000,
"Id_P2": 10003
},
{
"Id": 30003,
"Id_P1": 10007,
"Id_P2": 10009
},
{
"Id": 30002,
"Id_P1": 10006,
"Id_P2": 10008
}
]
}
57 changes: 57 additions & 0 deletions .extra/json/file.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
{
"Hills": [
{
"Id": 40000,
"Vertices": [
{
"X": 34.3546,
"Y": 22.4904
},
{
"X": 38.8959,
"Y": 8.39375
},
{
"X": 26.3129,
"Y": 8.20453
},
{
"X": 23.9477,
"Y": 15.8678
}
]
}
],
"Targets": [
{
"Id": 10000,
"X": 3.13373,
"Y": 5.85528
},
{
"Id": 10001,
"X": 7.16666,
"Y": 11.2553
},
{
"Id": 10002,
"X": 12.7717,
"Y": 22.3971
}
],
"Trappy_Circles": [
{
"Id": 20000,
"Radius": 6.47097,
"X": 21.5039,
"Y": 32.5937
}
],
"Trappy_Lines": [
{
"Id": 30000,
"Id_P1": 10000,
"Id_P2": 10001
}
]
}
Loading