Skip to content

Commit 3b1adac

Browse files
committed
Updated the documentation
- Updated dowygen-awesome to 2.3.2 - Modified the markdown sources to use Meson instead of CMake - Added an option to only build the documentation
1 parent 9ff923c commit 3b1adac

22 files changed

+1934
-416
lines changed

.github/workflows/update_docs.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ jobs:
2121
sudo pip3 install meson
2222
2323
- name: Configure meson
24-
run: |
25-
meson wrap update-db
26-
meson setup --prefix=${{github.workspace}}/install -Dmygl_build_doc=true build
24+
run: meson setup build --prefix=${{github.workspace}}/install -Dmygl_docs_only=true
2725

2826
- name: Generate the documentation pages
2927
working-directory: ${{github.workspace}}/build

README.md

+3-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
[![Windows build](https://github.com/tretre91/MyGL/actions/workflows/windows.yml/badge.svg)](https://github.com/tretre91/MyGL/actions/workflows/windows.yml)
2-
[![Linux build](https://github.com/tretre91/MyGL/actions/workflows/linux.yml/badge.svg)](https://github.com/tretre91/MyGL/actions/workflows/linux.yml)
1+
[![Build](https://github.com/tretre91/MyGL/actions/workflows/build.yml/badge.svg)](https://github.com/tretre91/MyGL/actions/workflows/build.yml)
32
[![License: Zlib](https://img.shields.io/badge/License-Zlib-lightgrey.svg)](https://opensource.org/licenses/Zlib)
43

54
# MyGL
@@ -16,19 +15,16 @@ others solutions that might better suit your needs (for example SFML or SDL2).
1615

1716
## Build
1817

19-
This library is built using CMake, you can clone the repo or download the source
20-
and then build it and install it with CMake.
21-
Further information can be found [here](docs/install.md).
18+
This library is built using Meson, further information can be found [here](docs/install.md).
2219
Note that you should have doxygen installed if you want to build the documentation.
2320

2421
## Dependencies
2522

2623
This library depends on [glfw](https://www.glfw.org/) for the window implementation
2724
and [freetype](https://www.freetype.org/) for the font / text implementation. They
28-
are downloaded when configuring CMake if not found on the system.
25+
can be downloaded when configuring the project if not found on the system.
2926

3027
It also has smaller dependencies which are included in the source code :
31-
- [CPM.cmake](https://github.com/cpm-cmake/CPM.cmake) for the dependency managment
3228
- [glm](https://github.com/g-truc/glm) for the vectors and most of the mathematical
3329
functions
3430
- [stb_image](https://github.com/nothings/stb/blob/master/stb_image.h) for texture

docs/Doxyfile.in

+3-3
Original file line numberDiff line numberDiff line change
@@ -188,11 +188,11 @@ GENERATE_HTML = YES
188188
HTML_OUTPUT = html
189189
HTML_FILE_EXTENSION = .html
190190
HTML_HEADER = @HTML_HEADER@
191-
HTML_FOOTER = @HTML_FOOTER@
191+
HTML_FOOTER =
192192
HTML_STYLESHEET =
193193
HTML_EXTRA_STYLESHEET = @CUSTOM_CSS@
194194
HTML_EXTRA_FILES = @EXTRA_FILES@
195-
HTML_COLORSTYLE = AUTO_LIGHT
195+
HTML_COLORSTYLE = LIGHT
196196
HTML_COLORSTYLE_HUE = 220
197197
HTML_COLORSTYLE_SAT = 100
198198
HTML_COLORSTYLE_GAMMA = 80
@@ -224,7 +224,7 @@ QHG_LOCATION =
224224
GENERATE_ECLIPSEHELP = NO
225225
ECLIPSE_DOC_ID = org.doxygen.Project
226226
DISABLE_INDEX = NO
227-
GENERATE_TREEVIEW = NO
227+
GENERATE_TREEVIEW = YES
228228
FULL_SIDEBAR = NO
229229
ENUM_VALUES_PER_LINE = 4
230230
TREEVIEW_WIDTH = 250

docs/doxygen-awesome/LICENSE

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) 2021 - 2023 jothepro
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

docs/doxygen-awesome/custom-style.css

+4-22
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,5 @@
1-
doxygen-awesome-dark-mode-toggle:after {
2-
content: none;
3-
}
4-
5-
#dark-mode-toggle-icon {
6-
width: 100%;
7-
height: 100%;
8-
padding: 15%;
9-
}
10-
11-
hr.footer {
12-
margin-bottom: 1px;
13-
}
14-
15-
address.footer {
16-
margin-bottom: 5px;
17-
}
18-
191
html.dark-mode {
20-
--note-color: rgb(221, 159, 0);
21-
--note-color-dark: rgb(130, 94, 0);
22-
--warning-color-darker: rgb(236, 205, 203);
23-
}
2+
--warning-color: #f3a600;
3+
--warning-color-dark: #5f4204;
4+
--warning-color-darker: #faf3d8;
5+
}

docs/doxygen-awesome/doxygen-awesome-darkmode-toggle.js

+56-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ https://github.com/jothepro/doxygen-awesome-css
55
66
MIT License
77
8-
Copyright (c) 2021 jothepro
8+
Copyright (c) 2021 - 2023 jothepro
99
1010
Permission is hereby granted, free of charge, to any person obtaining a copy
1111
of this software and associated documentation files (the "Software"), to deal
@@ -28,17 +28,59 @@ SOFTWARE.
2828
*/
2929

3030
class DoxygenAwesomeDarkModeToggle extends HTMLElement {
31+
// SVG icons from https://fonts.google.com/icons
32+
// Licensed under the Apache 2.0 license:
33+
// https://www.apache.org/licenses/LICENSE-2.0.html
34+
static lightModeIcon = `<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24px" viewBox="0 0 24 24" width="24px" fill="#FCBF00"><rect fill="none" height="24" width="24"/><circle cx="12" cy="12" opacity=".3" r="3"/><path d="M12,9c1.65,0,3,1.35,3,3s-1.35,3-3,3s-3-1.35-3-3S10.35,9,12,9 M12,7c-2.76,0-5,2.24-5,5s2.24,5,5,5s5-2.24,5-5 S14.76,7,12,7L12,7z M2,13l2,0c0.55,0,1-0.45,1-1s-0.45-1-1-1l-2,0c-0.55,0-1,0.45-1,1S1.45,13,2,13z M20,13l2,0c0.55,0,1-0.45,1-1 s-0.45-1-1-1l-2,0c-0.55,0-1,0.45-1,1S19.45,13,20,13z M11,2v2c0,0.55,0.45,1,1,1s1-0.45,1-1V2c0-0.55-0.45-1-1-1S11,1.45,11,2z M11,20v2c0,0.55,0.45,1,1,1s1-0.45,1-1v-2c0-0.55-0.45-1-1-1C11.45,19,11,19.45,11,20z M5.99,4.58c-0.39-0.39-1.03-0.39-1.41,0 c-0.39,0.39-0.39,1.03,0,1.41l1.06,1.06c0.39,0.39,1.03,0.39,1.41,0s0.39-1.03,0-1.41L5.99,4.58z M18.36,16.95 c-0.39-0.39-1.03-0.39-1.41,0c-0.39,0.39-0.39,1.03,0,1.41l1.06,1.06c0.39,0.39,1.03,0.39,1.41,0c0.39-0.39,0.39-1.03,0-1.41 L18.36,16.95z M19.42,5.99c0.39-0.39,0.39-1.03,0-1.41c-0.39-0.39-1.03-0.39-1.41,0l-1.06,1.06c-0.39,0.39-0.39,1.03,0,1.41 s1.03,0.39,1.41,0L19.42,5.99z M7.05,18.36c0.39-0.39,0.39-1.03,0-1.41c-0.39-0.39-1.03-0.39-1.41,0l-1.06,1.06 c-0.39,0.39-0.39,1.03,0,1.41s1.03,0.39,1.41,0L7.05,18.36z"/></svg>`
35+
static darkModeIcon = `<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24px" viewBox="0 0 24 24" width="24px" fill="#FE9700"><rect fill="none" height="24" width="24"/><path d="M9.37,5.51C9.19,6.15,9.1,6.82,9.1,7.5c0,4.08,3.32,7.4,7.4,7.4c0.68,0,1.35-0.09,1.99-0.27 C17.45,17.19,14.93,19,12,19c-3.86,0-7-3.14-7-7C5,9.07,6.81,6.55,9.37,5.51z" opacity=".3"/><path d="M9.37,5.51C9.19,6.15,9.1,6.82,9.1,7.5c0,4.08,3.32,7.4,7.4,7.4c0.68,0,1.35-0.09,1.99-0.27C17.45,17.19,14.93,19,12,19 c-3.86,0-7-3.14-7-7C5,9.07,6.81,6.55,9.37,5.51z M12,3c-4.97,0-9,4.03-9,9s4.03,9,9,9s9-4.03,9-9c0-0.46-0.04-0.92-0.1-1.36 c-0.98,1.37-2.58,2.26-4.4,2.26c-2.98,0-5.4-2.42-5.4-5.4c0-1.81,0.89-3.42,2.26-4.4C12.92,3.04,12.46,3,12,3L12,3z"/></svg>`
36+
static title = "Toggle Light/Dark Mode"
37+
3138
static prefersLightModeInDarkModeKey = "prefers-light-mode-in-dark-mode"
3239
static prefersDarkModeInLightModeKey = "prefers-dark-mode-in-light-mode"
3340

3441
static _staticConstructor = function() {
35-
DoxygenAwesomeDarkModeToggle.darkModeEnabled = DoxygenAwesomeDarkModeToggle.userPreference
36-
DoxygenAwesomeDarkModeToggle.enableDarkMode(DoxygenAwesomeDarkModeToggle.darkModeEnabled)
42+
DoxygenAwesomeDarkModeToggle.enableDarkMode(DoxygenAwesomeDarkModeToggle.userPreference)
43+
// Update the color scheme when the browsers preference changes
44+
// without user interaction on the website.
3745
window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', event => {
3846
DoxygenAwesomeDarkModeToggle.onSystemPreferenceChanged()
3947
})
48+
// Update the color scheme when the tab is made visible again.
49+
// It is possible that the appearance was changed in another tab
50+
// while this tab was in the background.
51+
document.addEventListener("visibilitychange", visibilityState => {
52+
if (document.visibilityState === 'visible') {
53+
DoxygenAwesomeDarkModeToggle.onSystemPreferenceChanged()
54+
}
55+
});
4056
}()
4157

58+
static init() {
59+
$(function() {
60+
$(document).ready(function() {
61+
const toggleButton = document.createElement('doxygen-awesome-dark-mode-toggle')
62+
toggleButton.title = DoxygenAwesomeDarkModeToggle.title
63+
toggleButton.updateIcon()
64+
65+
window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', event => {
66+
toggleButton.updateIcon()
67+
})
68+
document.addEventListener("visibilitychange", visibilityState => {
69+
if (document.visibilityState === 'visible') {
70+
toggleButton.updateIcon()
71+
}
72+
});
73+
74+
$(document).ready(function(){
75+
document.getElementById("MSearchBox").parentNode.appendChild(toggleButton)
76+
})
77+
$(window).resize(function(){
78+
document.getElementById("MSearchBox").parentNode.appendChild(toggleButton)
79+
})
80+
})
81+
})
82+
}
83+
4284
constructor() {
4385
super();
4486
this.onclick=this.toggleDarkMode
@@ -78,11 +120,12 @@ class DoxygenAwesomeDarkModeToggle extends HTMLElement {
78120
}
79121

80122
static enableDarkMode(enable) {
81-
let head = document.getElementsByTagName('head')[0]
82123
if(enable) {
124+
DoxygenAwesomeDarkModeToggle.darkModeEnabled = true
83125
document.documentElement.classList.add("dark-mode")
84126
document.documentElement.classList.remove("light-mode")
85127
} else {
128+
DoxygenAwesomeDarkModeToggle.darkModeEnabled = false
86129
document.documentElement.classList.remove("dark-mode")
87130
document.documentElement.classList.add("light-mode")
88131
}
@@ -99,6 +142,15 @@ class DoxygenAwesomeDarkModeToggle extends HTMLElement {
99142

100143
toggleDarkMode() {
101144
DoxygenAwesomeDarkModeToggle.userPreference = !DoxygenAwesomeDarkModeToggle.userPreference
145+
this.updateIcon()
146+
}
147+
148+
updateIcon() {
149+
if(DoxygenAwesomeDarkModeToggle.darkModeEnabled) {
150+
this.innerHTML = DoxygenAwesomeDarkModeToggle.darkModeIcon
151+
} else {
152+
this.innerHTML = DoxygenAwesomeDarkModeToggle.lightModeIcon
153+
}
102154
}
103155
}
104156

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
/**
2+
3+
Doxygen Awesome
4+
https://github.com/jothepro/doxygen-awesome-css
5+
6+
MIT License
7+
8+
Copyright (c) 2022 - 2023 jothepro
9+
10+
Permission is hereby granted, free of charge, to any person obtaining a copy
11+
of this software and associated documentation files (the "Software"), to deal
12+
in the Software without restriction, including without limitation the rights
13+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
14+
copies of the Software, and to permit persons to whom the Software is
15+
furnished to do so, subject to the following conditions:
16+
17+
The above copyright notice and this permission notice shall be included in all
18+
copies or substantial portions of the Software.
19+
20+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
21+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
22+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
23+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
24+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
25+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
26+
SOFTWARE.
27+
28+
*/
29+
30+
class DoxygenAwesomeFragmentCopyButton extends HTMLElement {
31+
constructor() {
32+
super();
33+
this.onclick=this.copyContent
34+
}
35+
static title = "Copy to clipboard"
36+
static copyIcon = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M16 1H4c-1.1 0-2 .9-2 2v14h2V3h12V1zm3 4H8c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h11c1.1 0 2-.9 2-2V7c0-1.1-.9-2-2-2zm0 16H8V7h11v14z"/></svg>`
37+
static successIcon = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M9 16.17L4.83 12l-1.42 1.41L9 19 21 7l-1.41-1.41L9 16.17z"/></svg>`
38+
static successDuration = 980
39+
static init() {
40+
$(function() {
41+
$(document).ready(function() {
42+
if(navigator.clipboard) {
43+
const fragments = document.getElementsByClassName("fragment")
44+
for(const fragment of fragments) {
45+
const fragmentWrapper = document.createElement("div")
46+
fragmentWrapper.className = "doxygen-awesome-fragment-wrapper"
47+
const fragmentCopyButton = document.createElement("doxygen-awesome-fragment-copy-button")
48+
fragmentCopyButton.innerHTML = DoxygenAwesomeFragmentCopyButton.copyIcon
49+
fragmentCopyButton.title = DoxygenAwesomeFragmentCopyButton.title
50+
51+
fragment.parentNode.replaceChild(fragmentWrapper, fragment)
52+
fragmentWrapper.appendChild(fragment)
53+
fragmentWrapper.appendChild(fragmentCopyButton)
54+
55+
}
56+
}
57+
})
58+
})
59+
}
60+
61+
62+
copyContent() {
63+
const content = this.previousSibling.cloneNode(true)
64+
// filter out line number from file listings
65+
content.querySelectorAll(".lineno, .ttc").forEach((node) => {
66+
node.remove()
67+
})
68+
let textContent = content.textContent
69+
// remove trailing newlines that appear in file listings
70+
let numberOfTrailingNewlines = 0
71+
while(textContent.charAt(textContent.length - (numberOfTrailingNewlines + 1)) == '\n') {
72+
numberOfTrailingNewlines++;
73+
}
74+
textContent = textContent.substring(0, textContent.length - numberOfTrailingNewlines)
75+
navigator.clipboard.writeText(textContent);
76+
this.classList.add("success")
77+
this.innerHTML = DoxygenAwesomeFragmentCopyButton.successIcon
78+
window.setTimeout(() => {
79+
this.classList.remove("success")
80+
this.innerHTML = DoxygenAwesomeFragmentCopyButton.copyIcon
81+
}, DoxygenAwesomeFragmentCopyButton.successDuration);
82+
}
83+
}
84+
85+
customElements.define("doxygen-awesome-fragment-copy-button", DoxygenAwesomeFragmentCopyButton)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
/**
2+
3+
Doxygen Awesome
4+
https://github.com/jothepro/doxygen-awesome-css
5+
6+
MIT License
7+
8+
Copyright (c) 2022 - 2023 jothepro
9+
10+
Permission is hereby granted, free of charge, to any person obtaining a copy
11+
of this software and associated documentation files (the "Software"), to deal
12+
in the Software without restriction, including without limitation the rights
13+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
14+
copies of the Software, and to permit persons to whom the Software is
15+
furnished to do so, subject to the following conditions:
16+
17+
The above copyright notice and this permission notice shall be included in all
18+
copies or substantial portions of the Software.
19+
20+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
21+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
22+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
23+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
24+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
25+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
26+
SOFTWARE.
27+
28+
*/
29+
30+
class DoxygenAwesomeParagraphLink {
31+
// Icon from https://fonts.google.com/icons
32+
// Licensed under the Apache 2.0 license:
33+
// https://www.apache.org/licenses/LICENSE-2.0.html
34+
static icon = `<svg xmlns="http://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M17 7h-4v2h4c1.65 0 3 1.35 3 3s-1.35 3-3 3h-4v2h4c2.76 0 5-2.24 5-5s-2.24-5-5-5zm-6 8H7c-1.65 0-3-1.35-3-3s1.35-3 3-3h4V7H7c-2.76 0-5 2.24-5 5s2.24 5 5 5h4v-2zm-3-4h8v2H8z"/></svg>`
35+
static title = "Permanent Link"
36+
static init() {
37+
$(function() {
38+
$(document).ready(function() {
39+
document.querySelectorAll(".contents a.anchor[id], .contents .groupheader > a[id]").forEach((node) => {
40+
let anchorlink = document.createElement("a")
41+
anchorlink.setAttribute("href", `#${node.getAttribute("id")}`)
42+
anchorlink.setAttribute("title", DoxygenAwesomeParagraphLink.title)
43+
anchorlink.classList.add("anchorlink")
44+
node.classList.add("anchor")
45+
anchorlink.innerHTML = DoxygenAwesomeParagraphLink.icon
46+
node.parentElement.appendChild(anchorlink)
47+
})
48+
})
49+
})
50+
}
51+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
2+
/**
3+
4+
Doxygen Awesome
5+
https://github.com/jothepro/doxygen-awesome-css
6+
7+
MIT License
8+
9+
Copyright (c) 2021 - 2023 jothepro
10+
11+
Permission is hereby granted, free of charge, to any person obtaining a copy
12+
of this software and associated documentation files (the "Software"), to deal
13+
in the Software without restriction, including without limitation the rights
14+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
15+
copies of the Software, and to permit persons to whom the Software is
16+
furnished to do so, subject to the following conditions:
17+
18+
The above copyright notice and this permission notice shall be included in all
19+
copies or substantial portions of the Software.
20+
21+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
22+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
23+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
24+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
25+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
26+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
27+
SOFTWARE.
28+
29+
*/
30+
31+
@media screen and (min-width: 768px) {
32+
33+
#MSearchBox {
34+
width: calc(var(--side-nav-fixed-width) - calc(2 * var(--spacing-medium)) - var(--searchbar-height) - 1px);
35+
}
36+
37+
#MSearchField {
38+
width: calc(var(--side-nav-fixed-width) - calc(2 * var(--spacing-medium)) - 66px - var(--searchbar-height));
39+
}
40+
}

0 commit comments

Comments
 (0)