732 Commits

Author SHA1 Message Date
kbz_8 552cc33ba3 temp fix 2026-05-11 13:55:59 +02:00
kbJeff-8 d1f5b7c68e [BOT] update dependencies 2026-05-10 12:33:26 +02:00
kbJeff-8 e3ab91c7eb [BOT] update dependencies 2026-04-19 18:24:23 +02:00
kbJeff-8 6f0beebdf9 [BOT] update dependencies 2026-04-14 02:47:02 +02:00
kbJeff-8 f9f4fc6425 [BOT] update dependencies 2026-04-06 22:23:08 +02:00
0verLighT 59b3a297f9 chore: rm wrap_mode force-fallback
sdl2 warp should be used only if the system does not have sdl2 dependency
2026-03-24 23:14:42 +01:00
kbz_8 790e24ebdb Update meson.build 2026-03-24 23:14:42 +01:00
0verLighT 3a2563a7f5 chore: update meson.build 2026-03-24 23:14:42 +01:00
kbz_8 cf491fc56d fix 2026-03-23 21:45:36 +01:00
kbz_8 492365f6dd swithing to manual surface management 2026-03-23 21:45:36 +01:00
kbz_8 564942ad35 fix 2026-03-23 21:45:36 +01:00
kbJeff-8 2751206578 [BOT] update dependencies 2026-03-23 21:45:36 +01:00
kbJeff-8 002c35ccdb [BOT] update dependencies 2026-03-23 21:45:36 +01:00
kbJeff-8 36e63bbbe7 [BOT] update dependencies 2026-03-08 11:42:50 +01:00
kbz_8 3a11c1d350 fixing file access 2026-03-03 12:10:18 +01:00
kbJeff-8 74613d230f [BOT] update dependencies 2026-03-03 12:10:18 +01:00
kbJeff-8 f1e89ca90e [BOT] update dependencies 2026-02-08 12:13:11 +01:00
kbz_8 1566fbfc00 fixing image resize 2026-02-05 15:18:03 +01:00
kbz_8 6c1400e62c azy, 7h du matin, je sais pas écrire 2026-02-04 07:32:55 +01:00
kbz_8 25fb5285f7 fixed issue with default font loading 2026-02-04 07:32:55 +01:00
Yannis 87059f8ca3 Check if font file exists 2026-02-04 07:32:55 +01:00
kbz_8 db299c6930 Indev (#202) 2026-02-03 12:10:08 +01:00
kbz_8 ebfc00d015 fixing put pixel resize issue (#201) 2026-02-03 12:05:37 +01:00
kbz_8 7639c27df4 fixing put pixel resize issue 2026-02-03 11:58:06 +01:00
kbz_8 2d9f193a72 Bump actions/checkout from 5 to 6 (#200)
Bumps [actions/checkout](https://github.com/actions/checkout) from 5 to
6.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/actions/checkout/releases">actions/checkout's
releases</a>.</em></p>
<blockquote>
<h2>v6.0.0</h2>
<h2>What's Changed</h2>
<ul>
<li>Update README to include Node.js 24 support details and requirements
by <a href="https://github.com/salmanmkc"><code>@​salmanmkc</code></a>
in <a
href="https://redirect.github.com/actions/checkout/pull/2248">actions/checkout#2248</a></li>
<li>Persist creds to a separate file by <a
href="https://github.com/ericsciple"><code>@​ericsciple</code></a> in <a
href="https://redirect.github.com/actions/checkout/pull/2286">actions/checkout#2286</a></li>
<li>v6-beta by <a
href="https://github.com/ericsciple"><code>@​ericsciple</code></a> in <a
href="https://redirect.github.com/actions/checkout/pull/2298">actions/checkout#2298</a></li>
<li>update readme/changelog for v6 by <a
href="https://github.com/ericsciple"><code>@​ericsciple</code></a> in <a
href="https://redirect.github.com/actions/checkout/pull/2311">actions/checkout#2311</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/actions/checkout/compare/v5.0.0...v6.0.0">https://github.com/actions/checkout/compare/v5.0.0...v6.0.0</a></p>
<h2>v6-beta</h2>
<h2>What's Changed</h2>
<p>Updated persist-credentials to store the credentials under
<code>$RUNNER_TEMP</code> instead of directly in the local git
config.</p>
<p>This requires a minimum Actions Runner version of <a
href="https://github.com/actions/runner/releases/tag/v2.329.0">v2.329.0</a>
to access the persisted credentials for <a
href="https://docs.github.com/en/actions/tutorials/use-containerized-services/create-a-docker-container-action">Docker
container action</a> scenarios.</p>
<h2>v5.0.1</h2>
<h2>What's Changed</h2>
<ul>
<li>Port v6 cleanup to v5 by <a
href="https://github.com/ericsciple"><code>@​ericsciple</code></a> in <a
href="https://redirect.github.com/actions/checkout/pull/2301">actions/checkout#2301</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/actions/checkout/compare/v5...v5.0.1">https://github.com/actions/checkout/compare/v5...v5.0.1</a></p>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/actions/checkout/blob/main/CHANGELOG.md">actions/checkout's
changelog</a>.</em></p>
<blockquote>
<h1>Changelog</h1>
<h2>v6.0.2</h2>
<ul>
<li>Fix tag handling: preserve annotations and explicit fetch-tags by <a
href="https://github.com/ericsciple"><code>@​ericsciple</code></a> in <a
href="https://redirect.github.com/actions/checkout/pull/2356">actions/checkout#2356</a></li>
</ul>
<h2>v6.0.1</h2>
<ul>
<li>Add worktree support for persist-credentials includeIf by <a
href="https://github.com/ericsciple"><code>@​ericsciple</code></a> in <a
href="https://redirect.github.com/actions/checkout/pull/2327">actions/checkout#2327</a></li>
</ul>
<h2>v6.0.0</h2>
<ul>
<li>Persist creds to a separate file by <a
href="https://github.com/ericsciple"><code>@​ericsciple</code></a> in <a
href="https://redirect.github.com/actions/checkout/pull/2286">actions/checkout#2286</a></li>
<li>Update README to include Node.js 24 support details and requirements
by <a href="https://github.com/salmanmkc"><code>@​salmanmkc</code></a>
in <a
href="https://redirect.github.com/actions/checkout/pull/2248">actions/checkout#2248</a></li>
</ul>
<h2>v5.0.1</h2>
<ul>
<li>Port v6 cleanup to v5 by <a
href="https://github.com/ericsciple"><code>@​ericsciple</code></a> in <a
href="https://redirect.github.com/actions/checkout/pull/2301">actions/checkout#2301</a></li>
</ul>
<h2>v5.0.0</h2>
<ul>
<li>Update actions checkout to use node 24 by <a
href="https://github.com/salmanmkc"><code>@​salmanmkc</code></a> in <a
href="https://redirect.github.com/actions/checkout/pull/2226">actions/checkout#2226</a></li>
</ul>
<h2>v4.3.1</h2>
<ul>
<li>Port v6 cleanup to v4 by <a
href="https://github.com/ericsciple"><code>@​ericsciple</code></a> in <a
href="https://redirect.github.com/actions/checkout/pull/2305">actions/checkout#2305</a></li>
</ul>
<h2>v4.3.0</h2>
<ul>
<li>docs: update README.md by <a
href="https://github.com/motss"><code>@​motss</code></a> in <a
href="https://redirect.github.com/actions/checkout/pull/1971">actions/checkout#1971</a></li>
<li>Add internal repos for checking out multiple repositories by <a
href="https://github.com/mouismail"><code>@​mouismail</code></a> in <a
href="https://redirect.github.com/actions/checkout/pull/1977">actions/checkout#1977</a></li>
<li>Documentation update - add recommended permissions to Readme by <a
href="https://github.com/benwells"><code>@​benwells</code></a> in <a
href="https://redirect.github.com/actions/checkout/pull/2043">actions/checkout#2043</a></li>
<li>Adjust positioning of user email note and permissions heading by <a
href="https://github.com/joshmgross"><code>@​joshmgross</code></a> in <a
href="https://redirect.github.com/actions/checkout/pull/2044">actions/checkout#2044</a></li>
<li>Update README.md by <a
href="https://github.com/nebuk89"><code>@​nebuk89</code></a> in <a
href="https://redirect.github.com/actions/checkout/pull/2194">actions/checkout#2194</a></li>
<li>Update CODEOWNERS for actions by <a
href="https://github.com/TingluoHuang"><code>@​TingluoHuang</code></a>
in <a
href="https://redirect.github.com/actions/checkout/pull/2224">actions/checkout#2224</a></li>
<li>Update package dependencies by <a
href="https://github.com/salmanmkc"><code>@​salmanmkc</code></a> in <a
href="https://redirect.github.com/actions/checkout/pull/2236">actions/checkout#2236</a></li>
</ul>
<h2>v4.2.2</h2>
<ul>
<li><code>url-helper.ts</code> now leverages well-known environment
variables by <a href="https://github.com/jww3"><code>@​jww3</code></a>
in <a
href="https://redirect.github.com/actions/checkout/pull/1941">actions/checkout#1941</a></li>
<li>Expand unit test coverage for <code>isGhes</code> by <a
href="https://github.com/jww3"><code>@​jww3</code></a> in <a
href="https://redirect.github.com/actions/checkout/pull/1946">actions/checkout#1946</a></li>
</ul>
<h2>v4.2.1</h2>
<ul>
<li>Check out other refs/* by commit if provided, fall back to ref by <a
href="https://github.com/orhantoy"><code>@​orhantoy</code></a> in <a
href="https://redirect.github.com/actions/checkout/pull/1924">actions/checkout#1924</a></li>
</ul>
<h2>v4.2.0</h2>
<ul>
<li>Add Ref and Commit outputs by <a
href="https://github.com/lucacome"><code>@​lucacome</code></a> in <a
href="https://redirect.github.com/actions/checkout/pull/1180">actions/checkout#1180</a></li>
<li>Dependency updates by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a>- <a
href="https://redirect.github.com/actions/checkout/pull/1777">actions/checkout#1777</a>,
<a
href="https://redirect.github.com/actions/checkout/pull/1872">actions/checkout#1872</a></li>
</ul>
<h2>v4.1.7</h2>
<ul>
<li>Bump the minor-npm-dependencies group across 1 directory with 4
updates by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/actions/checkout/pull/1739">actions/checkout#1739</a></li>
<li>Bump actions/checkout from 3 to 4 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/actions/checkout/pull/1697">actions/checkout#1697</a></li>
<li>Check out other refs/* by commit by <a
href="https://github.com/orhantoy"><code>@​orhantoy</code></a> in <a
href="https://redirect.github.com/actions/checkout/pull/1774">actions/checkout#1774</a></li>
<li>Pin actions/checkout's own workflows to a known, good, stable
version. by <a href="https://github.com/jww3"><code>@​jww3</code></a> in
<a
href="https://redirect.github.com/actions/checkout/pull/1776">actions/checkout#1776</a></li>
</ul>
<h2>v4.1.6</h2>
<ul>
<li>Check platform to set archive extension appropriately by <a
href="https://github.com/cory-miller"><code>@​cory-miller</code></a> in
<a
href="https://redirect.github.com/actions/checkout/pull/1732">actions/checkout#1732</a></li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/actions/checkout/commit/8e8c483db84b4bee98b60c0593521ed34d9990e8"><code>8e8c483</code></a>
Clarify v6 README (<a
href="https://redirect.github.com/actions/checkout/issues/2328">#2328</a>)</li>
<li><a
href="https://github.com/actions/checkout/commit/033fa0dc0b82693d8986f1016a0ec2c5e7d9cbb1"><code>033fa0d</code></a>
Add worktree support for persist-credentials includeIf (<a
href="https://redirect.github.com/actions/checkout/issues/2327">#2327</a>)</li>
<li><a
href="https://github.com/actions/checkout/commit/c2d88d3ecc89a9ef08eebf45d9637801dcee7eb5"><code>c2d88d3</code></a>
Update all references from v5 and v4 to v6 (<a
href="https://redirect.github.com/actions/checkout/issues/2314">#2314</a>)</li>
<li><a
href="https://github.com/actions/checkout/commit/1af3b93b6815bc44a9784bd300feb67ff0d1eeb3"><code>1af3b93</code></a>
update readme/changelog for v6 (<a
href="https://redirect.github.com/actions/checkout/issues/2311">#2311</a>)</li>
<li><a
href="https://github.com/actions/checkout/commit/71cf2267d89c5cb81562390fa70a37fa40b1305e"><code>71cf226</code></a>
v6-beta (<a
href="https://redirect.github.com/actions/checkout/issues/2298">#2298</a>)</li>
<li><a
href="https://github.com/actions/checkout/commit/069c6959146423d11cd0184e6accf28f9d45f06e"><code>069c695</code></a>
Persist creds to a separate file (<a
href="https://redirect.github.com/actions/checkout/issues/2286">#2286</a>)</li>
<li><a
href="https://github.com/actions/checkout/commit/ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493"><code>ff7abcd</code></a>
Update README to include Node.js 24 support details and requirements (<a
href="https://redirect.github.com/actions/checkout/issues/2248">#2248</a>)</li>
<li>See full diff in <a
href="https://github.com/actions/checkout/compare/v5...v6">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/checkout&package-manager=github_actions&previous-version=5&new-version=6)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>
2026-02-03 07:08:13 +01:00
dependabot[bot] 6aac4a71de Bump actions/checkout from 5 to 6
Bumps [actions/checkout](https://github.com/actions/checkout) from 5 to 6.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v5...v6)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-02-03 03:49:46 +00:00
kbz_8 0ff3085448 update dependencies (#198)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action
2026-02-01 13:45:15 +01:00
kbJeff-8 b286da89e2 [BOT] update dependencies 2026-02-01 01:07:04 +00:00
kbJeff-8 55eb31551a [BOT] update dependencies 2026-01-28 09:41:08 +01:00
dependabot[bot] 7741ed2dd4 Bump actions/setup-python from 5 to 6
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 5 to 6.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v5...v6)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-01-28 09:41:08 +01:00
kbz_8 b09f5c39f7 fixes: windows x86 compilation error missing VKAPI_PTR (#197)
This pr fixes windows x86 compilation error (xmake and meson.build).

In runtime/Sources/Renderer/RenderCore.cpp 
```cpp
void* VKAPI_PTR VulkanAllocationFunction(void*, std::size_t size, std::size_t alignment, VkSystemAllocationScope)
	{
		return MemManager::AlignedMalloc(alignment, size);
	}

	void* VKAPI_PTR VulkanReallocationFunction(void*, void* ptr, std::size_t size, std::size_t alignment, VkSystemAllocationScope)
	{
		return MemManager::AlignedRealloc(ptr, alignment, size);
	}

	void VKAPI_PTR VulkanFreeFunction(void*, void* ptr)
	{
		MemManager::Free(ptr);
	}
```
The log of the compilation error:  
- [meson failure
log](https://github.com/0verLighT/MacroLibX/actions/runs/21409805574/job/61643508435)
- [xmake failure
log](https://github.com/0verLighT/MacroLibX/actions/runs/21412208397/job/61651747515)

In the macrolibx VKAPI_PTR was missing, On windows x86, this caused a
compilation error.


This add some features:
- New CICD for windows meson (x64, x86, MYSYS2, clang-cl) and windows
xmake x86
- Fallback for meson.build dependency SDL2 in `subprojects/SDL2.wrap`
2026-01-28 07:17:01 +01:00
0verLighT 91b93a6f10 ci(xmake): add test on x86 architecture due to a Vulkan issue (VKAPI_PTR)
Signed-off-by: 0verLighT <alexandre@0verlight.com>
2026-01-27 21:07:41 +01:00
0verLighT 26c47c3a95 fix && ci (meson): trying to fix Vulkan issue in renderCore.cpp and add some windows test based from meson wrapdb CI
Signed-off-by: 0verLighT <alexandre@0verlight.com>
2026-01-27 20:47:11 +01:00
0verLighT 28142f764f ci(windows_meson): test ci setup meson for windows
chore: add folder subprojects for download sdl2 if it's not present in pkgconfig
Signed-off-by: 0verLighT <alexandre@0verlight.com>
2026-01-27 19:47:30 +01:00
kbz_8 26ccd5eeee Few doc fixes (#194)
Also, the doc says `@param img` but declaration has `mlx_image image`
which is a mismatch, I’m not sure what to do here, so I’m leaving it
untouched.

[This page](https://macrolibx.kbz8.me/guides/text/) of the docs should
be updated too as `mlx_set_font` and `mlx_set_font_scale` don't take a
`mlx_window` anymore.
2026-01-20 19:48:15 +01:00
Luna Mira Lage 849ecbaf1f Few doc fixes 2026-01-20 18:50:29 +01:00
kbz_8 b345fbc672 Indev (#191) 2026-01-11 14:09:00 +01:00
kbz_8 bb019f20a7 Merge branch 'master' into indev 2026-01-11 14:02:39 +01:00
kbz_8 33ae4c3a37 fixing windows compilation issues, bumping version 2026-01-11 14:01:37 +01:00
Jeff 32987f0afe update dependencies (#190)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action

Co-authored-by: kbJeff-8 <kbJeff-8@users.noreply.github.com>
2026-01-11 02:06:15 +01:00
kbz_8 3e82487037 Indev (#189)
Co-authored-by: 0verLighT <alexandre@0verlight.com>
2026-01-11 00:33:12 +01:00
kbz_8 b33154d846 Merge branch 'master' into indev 2026-01-11 00:28:50 +01:00
kbz_8 278e29d277 bumping version, small fixes 2026-01-11 00:27:49 +01:00
kbz_8 8ccfa0bee1 Update README.md 2026-01-11 00:24:16 +01:00
kbz_8 b0806958fe fixing small CI mistakes 2026-01-11 00:24:16 +01:00
kbz_8 7e31195b77 improving meson CI 2026-01-11 00:24:16 +01:00
0verLighT 5912aa5c12 feat(ci): add github actions for meson.build on macOS and Ubuntu 2026-01-11 00:24:16 +01:00
0verLighT e3ee9f0327 refactor(meson): delete all meson.build files in the runtime subfolders and regroup all sources in a meson.build file 2026-01-11 00:24:16 +01:00
0verLighT 807931fc8b feat(meson): adding meson.build 2026-01-11 00:24:16 +01:00
kbz_8 768dc0c1d9 Update README.md (#187) 2026-01-09 22:04:02 +01:00
kbz_8 55086a05a6 Update README.md 2026-01-09 22:03:53 +01:00
kbz_8 bef1888a79 adding Meson in mlx (#186)
This PR adds meson.build support for creating `mlx.wrap` in [meson
wrapdb](https://mesonbuild.com/Wrapdb-projects.html)
2026-01-09 21:57:25 +01:00
kbz_8 519b273a20 fixing small CI mistakes 2026-01-09 21:53:22 +01:00
kbz_8 fd8beaaf17 improving meson CI 2026-01-09 21:51:40 +01:00
0verLighT c4979ceded feat(ci): add github actions for meson.build on macOS and Ubuntu 2026-01-09 21:08:42 +01:00
0verLighT f4a1dc386a refactor(meson): delete all meson.build files in the runtime subfolders and regroup all sources in a meson.build file 2026-01-09 15:09:39 +01:00
0verLighT 83d05cc6e2 feat(meson): adding meson.build 2026-01-09 08:37:47 +01:00
kbz_8 f44c4d106c Indev (#185) 2026-01-06 11:57:45 +01:00
kbz_8 6fd5814032 updating deps 2026-01-06 11:50:25 +01:00
kbz_8 7a3a65d26c updating deps 2026-01-06 11:48:23 +01:00
kbJeff-8 c251fb81e3 [BOT] update dependencies 2025-12-21 11:29:58 +01:00
dependabot[bot] cf84449dee Bump peter-evans/create-pull-request from 7 to 8
Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 7 to 8.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/v7...v8)

---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
  dependency-version: '8'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-12-16 07:09:03 +01:00
dependabot[bot] 58f1e76a56 Bump actions/cache from 4 to 5
Bumps [actions/cache](https://github.com/actions/cache) from 4 to 5.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v4...v5)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-12-16 07:08:47 +01:00
kbJeff-8 b6c7e8095f [BOT] update dependencies 2025-12-14 11:35:26 +01:00
kbJeff-8 a6a3178425 [BOT] update dependencies 2025-12-02 22:50:02 +01:00
dependabot[bot] 8c43af3ad1 Bump actions/checkout from 4 to 6
Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 6.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4...v6)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-12-02 22:50:02 +01:00
kbJeff-8 1f96fa56d8 [BOT] update dependencies 2025-12-02 22:50:02 +01:00
kbz_8 4f0d8dac67 fixing merge 2025-12-02 22:43:31 +01:00
kbJeff-8 85150693af [BOT] update dependencies 2025-11-30 12:24:25 +01:00
dependabot[bot] 56fa5ac613 Bump actions/checkout from 4 to 6
Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 6.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4...v6)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-11-25 07:18:57 +01:00
kbJeff-8 19f5a2eb2f [BOT] update dependencies 2025-11-23 01:58:07 +01:00
kbJeff-8 cb2979108b [BOT] update dependencies 2025-11-16 11:11:59 +01:00
kbJeff-8 454fcc6e65 [BOT] update dependencies 2025-11-16 11:04:56 +01:00
kbz_8 a51d391a04 fixing infinite descriptor pool creation bug (#169) 2025-11-04 20:58:41 +01:00
kbz_8 9ae3f46f2e fixing merge conflicts 2025-11-04 20:51:16 +01:00
kbz_8 4adaccf72a removing garbage collector from SDL 2025-11-04 20:38:53 +01:00
kbz_8 67523e7fb4 removing garbage file 2025-11-04 20:33:30 +01:00
kbz_8 ec019ba45c removing garbage file 2025-11-04 20:33:04 +01:00
kbz_8 ba0398092a fixing infinite descriptor pool creation bug 2025-11-04 20:32:38 +01:00
kbJeff-8 b89bacfa95 [BOT] update dependencies 2025-11-02 01:54:27 +01:00
kbJeff-8 f84e0b2312 [BOT] update dependencies 2025-10-26 14:25:11 +01:00
kbz_8 65ff11b301 actual fix 2025-10-23 08:57:41 +02:00
kbJeff-8 1f780e2a8a [BOT] update dependencies 2025-10-23 08:57:41 +02:00
kbJeff-8 06ddcf99d7 [BOT] update dependencies 2025-10-23 08:57:41 +02:00
kbz_8 ece1fc93da Merge branch 'master' into indev 2025-10-23 08:51:03 +02:00
kbz_8 04bc524ae8 update dependencies (#165)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action
2025-10-23 08:37:49 +02:00
kbz_8 b63f07bfe8 actual fix 2025-10-23 08:31:58 +02:00
kbJeff-8 a40907b68f [BOT] update dependencies 2025-10-23 06:26:25 +00:00
kbz_8 9ec992d54c update dependencies (#164)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action
2025-10-23 08:17:00 +02:00
kbJeff-8 a665f7c448 [BOT] update dependencies 2025-10-23 06:09:55 +00:00
kbz_8 cee944d996 Indev (#163) 2025-10-22 17:20:12 +02:00
kbz_8 493696482c fixing small mistakes 2025-10-22 17:07:33 +02:00
kbz_8 9c4aaea79f removing now useless image optimisation flag 2025-10-22 17:02:41 +02:00
kbz_8 ffc0f26701 Indev (#162)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-10-22 16:39:53 +02:00
kbz_8 1835db0943 fixing fetching deps CI 2025-10-22 16:33:46 +02:00
kbz_8 7c35354c44 fixing fetching deps CI 2025-10-22 16:33:46 +02:00
kbz_8 c99cf63194 fixing fetching deps CI 2025-10-22 16:33:46 +02:00
kbz_8 c5026d93dc fixing fetching deps CI 2025-10-22 16:33:46 +02:00
kbz_8 22fb83fee1 fixing fetching deps CI 2025-10-22 16:33:46 +02:00
kbz_8 c62168b0e2 fixing fetching deps CI 2025-10-22 16:33:46 +02:00
kbz_8 31cbdec371 fixing fetching deps CI 2025-10-22 16:33:46 +02:00
kbz_8 cbf185e6c5 fixing fetching deps CI 2025-10-22 16:33:46 +02:00
dependabot[bot] e5b555dbc3 Bump NcStudios/VulkanCI from 1.0 to 1.2
Bumps [NcStudios/VulkanCI](https://github.com/ncstudios/vulkanci) from 1.0 to 1.2.
- [Release notes](https://github.com/ncstudios/vulkanci/releases)
- [Commits](https://github.com/ncstudios/vulkanci/compare/v1.0...v1.2)

---
updated-dependencies:
- dependency-name: NcStudios/VulkanCI
  dependency-version: '1.2'
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-10-22 16:33:46 +02:00
kbz_8 15f2649562 fixing deps fetching CI 2025-10-22 16:33:46 +02:00
kbz_8 a28e17aa31 fixing CI not being trigger from automatic pull requests 2025-10-22 16:33:46 +02:00
kbz_8 c0095314fd fixing deps fetching CI 2025-10-22 15:20:59 +02:00
kbz_8 4529ba5752 fixing CI not being trigger from automatic pull requests 2025-10-22 15:20:59 +02:00
kbz_8 d127e6c3f9 bumping mlx version 2025-10-22 13:38:53 +02:00
kbz_8 a9f5be910f fixing render finished semaphore based on max frame in flight issue (#155) 2025-10-22 13:37:25 +02:00
kbz_8 4f1cad4e72 fixing render finished semaphore based on max frame in flight issue 2025-10-22 13:30:55 +02:00
kbz_8 9573199ad9 Indev (#154)
adding unit test CI
fixing windows build
fixing issue with descriptor pools when over 1024 images rendered
2025-10-22 12:25:32 +02:00
kbz_8 72e158a0a7 Merge branch 'master' into indev 2025-10-22 12:19:25 +02:00
kbz_8 72d8ddae64 fixing descriptor pools issue, adding unit tests shortcut to makefile 2025-10-22 12:09:28 +02:00
kbz_8 93014c1668 143 headless mode (#150) 2025-09-24 19:49:32 +02:00
kbz_8 19758b6d40 updating kvf 2025-09-24 19:39:22 +02:00
kbz_8 5c385675c7 updating readme 2025-09-24 19:22:45 +02:00
kbz_8 ab9d12ae17 fixing physical device selection under swiftshaders 2025-09-24 19:11:53 +02:00
kbz_8 18b57e3761 fixing unit tests CI 2025-09-24 16:32:55 +02:00
kbz_8 bb67bd42e1 fixing unit tests CI 2025-09-24 16:27:59 +02:00
kbz_8 0894cb5d4f fixing unit tests CI 2025-09-24 16:24:06 +02:00
kbz_8 e45ded6ea9 fixing unit tests CI 2025-09-24 15:48:08 +02:00
kbz_8 93d0b1828b fixing unit tests CI 2025-09-24 11:06:05 +02:00
kbz_8 d2057e3108 fixing unit tests CI 2025-09-24 10:57:29 +02:00
kbz_8 e7baccb6cc fixing unit tests CI 2025-09-24 10:56:22 +02:00
kbz_8 41cae01a9b fixing unit tests CI 2025-09-24 10:55:06 +02:00
kbz_8 008dc4132c fixing unit tests CI 2025-09-24 10:48:08 +02:00
kbz_8 3e29dd1bbe fixing unit tests CI 2025-09-24 10:37:03 +02:00
kbz_8 9f795fa67e fixing unit tests CI 2025-09-24 10:26:28 +02:00
kbz_8 4e88505aa6 adding unit test CI 2025-09-24 10:15:54 +02:00
kbz_8 324ef540fd adding headless mode 2025-09-24 09:54:44 +02:00
kbz_8 741fa6cf89 Bump actions/first-interaction from 1 to 2 (#146)
Bumps
[actions/first-interaction](https://github.com/actions/first-interaction)
from 1 to 2.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/actions/first-interaction/releases">actions/first-interaction's
releases</a>.</em></p>
<blockquote>
<h2>v2.0.0</h2>
<h2>What's Changed</h2>
<ul>
<li>Installed <code>@​actions/core</code> by <a
href="https://github.com/TheGuptaEmpire"><code>@​TheGuptaEmpire</code></a>
in <a
href="https://redirect.github.com/actions/first-interaction/pull/274">actions/first-interaction#274</a></li>
<li>Update README.md by <a
href="https://github.com/Alirezaaraby"><code>@​Alirezaaraby</code></a>
in <a
href="https://redirect.github.com/actions/first-interaction/pull/75">actions/first-interaction#75</a></li>
<li>DOC: adjust the example to show a full yaml file by <a
href="https://github.com/tacaswell"><code>@​tacaswell</code></a> in <a
href="https://redirect.github.com/actions/first-interaction/pull/36">actions/first-interaction#36</a></li>
<li>Demonstrate |- multiline YAML string in README by <a
href="https://github.com/simonw"><code>@​simonw</code></a> in <a
href="https://redirect.github.com/actions/first-interaction/pull/16">actions/first-interaction#16</a></li>
<li>Update README.md by <a
href="https://github.com/nebuk89"><code>@​nebuk89</code></a> in <a
href="https://redirect.github.com/actions/first-interaction/pull/317">actions/first-interaction#317</a></li>
<li>Convert from Container to TypeScript Action by <a
href="https://github.com/ncalteen"><code>@​ncalteen</code></a> in <a
href="https://redirect.github.com/actions/first-interaction/pull/311">actions/first-interaction#311</a></li>
<li>Bump <code>@​octokit/types</code> from 13.8.0 to 14.1.0 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a>[bot]
in <a
href="https://redirect.github.com/actions/first-interaction/pull/323">actions/first-interaction#323</a></li>
<li>Bump undici from 5.28.5 to 5.29.0 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a>[bot]
in <a
href="https://redirect.github.com/actions/first-interaction/pull/319">actions/first-interaction#319</a></li>
<li>Bump the npm-development group with 16 updates by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a>[bot]
in <a
href="https://redirect.github.com/actions/first-interaction/pull/320">actions/first-interaction#320</a></li>
<li>Bump <code>@​actions/github</code> from 6.0.0 to 6.0.1 in the
npm-production group by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a>[bot]
in <a
href="https://redirect.github.com/actions/first-interaction/pull/321">actions/first-interaction#321</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a
href="https://github.com/TheGuptaEmpire"><code>@​TheGuptaEmpire</code></a>
made their first contribution in <a
href="https://redirect.github.com/actions/first-interaction/pull/274">actions/first-interaction#274</a></li>
<li><a
href="https://github.com/Alirezaaraby"><code>@​Alirezaaraby</code></a>
made their first contribution in <a
href="https://redirect.github.com/actions/first-interaction/pull/75">actions/first-interaction#75</a></li>
<li><a href="https://github.com/tacaswell"><code>@​tacaswell</code></a>
made their first contribution in <a
href="https://redirect.github.com/actions/first-interaction/pull/36">actions/first-interaction#36</a></li>
<li><a href="https://github.com/simonw"><code>@​simonw</code></a> made
their first contribution in <a
href="https://redirect.github.com/actions/first-interaction/pull/16">actions/first-interaction#16</a></li>
<li><a href="https://github.com/nebuk89"><code>@​nebuk89</code></a> made
their first contribution in <a
href="https://redirect.github.com/actions/first-interaction/pull/317">actions/first-interaction#317</a></li>
<li><a href="https://github.com/ncalteen"><code>@​ncalteen</code></a>
made their first contribution in <a
href="https://redirect.github.com/actions/first-interaction/pull/311">actions/first-interaction#311</a></li>
<li><a
href="https://github.com/dependabot"><code>@​dependabot</code></a>[bot]
made their first contribution in <a
href="https://redirect.github.com/actions/first-interaction/pull/323">actions/first-interaction#323</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/actions/first-interaction/compare/v1.3.0...v2.0.0">https://github.com/actions/first-interaction/compare/v1.3.0...v2.0.0</a></p>
<h2>v1.3.0</h2>
<h1>Upgrade our base image from node v14 -&gt; v20</h1>
<p>Add dependency on <code>@octokit/rest</code> and
<code>@actions/http-client</code>.</p>
<p>👉 See the PR for details: <a
href="https://redirect.github.com/actions/first-interaction/pull/287">actions/first-interaction#287</a></p>
<h2>v1.2.0</h2>
<h1>Upgrade our codeql actions from v1 -&gt; v2</h1>
<p>Updates <code>github/codeql-action/init</code>,
<code>github/codeql-action/autobuild</code>, and
<code>github/codeql-action/analyze</code> to <code>v2</code>.</p>
<p>👉 See the PR for details: <a
href="https://redirect.github.com/actions/first-interaction/pull/275">actions/first-interaction#275</a></p>
<h2>v1.1.1</h2>
<p>Update bundled <code>@actions/toolkit</code> packages to fix <a
href="https://redirect.github.com/actions/first-interaction/issues/101">actions/first-interaction#101</a></p>
<h2>v1.1.0</h2>
<p>No release notes provided.</p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/actions/first-interaction/commit/2d4393e6bc0e2efb2e48fba7e06819c3bf61ffc9"><code>2d4393e</code></a>
Merge pull request <a
href="https://redirect.github.com/actions/first-interaction/issues/321">#321</a>
from actions/dependabot/npm_and_yarn/npm-production-b...</li>
<li><a
href="https://github.com/actions/first-interaction/commit/4dbde70384151bfd744db7357b0b084af0f8aa60"><code>4dbde70</code></a>
Rebuild dist</li>
<li><a
href="https://github.com/actions/first-interaction/commit/329f5ebce93dfc6ceecf574968a27bfc964e30a1"><code>329f5eb</code></a>
Bump <code>@​actions/github</code> from 6.0.0 to 6.0.1 in the
npm-production group</li>
<li><a
href="https://github.com/actions/first-interaction/commit/a7b6951cb1a192cdd1836a5cfc74ddebc8e6d6d3"><code>a7b6951</code></a>
Merge pull request <a
href="https://redirect.github.com/actions/first-interaction/issues/320">#320</a>
from actions/dependabot/npm_and_yarn/npm-development-...</li>
<li><a
href="https://github.com/actions/first-interaction/commit/15ecaf52fe1b053d85565554ca5353c00f85cba4"><code>15ecaf5</code></a>
Rebuild dist</li>
<li><a
href="https://github.com/actions/first-interaction/commit/12e4e8b26d063bf642efedd6e139e561d48e8287"><code>12e4e8b</code></a>
Bump the npm-development group with 16 updates</li>
<li><a
href="https://github.com/actions/first-interaction/commit/cf67d10ea145b6732ab396c3b28fa9b7b8e74e9d"><code>cf67d10</code></a>
Merge pull request <a
href="https://redirect.github.com/actions/first-interaction/issues/319">#319</a>
from actions/dependabot/npm_and_yarn/undici-5.29.0</li>
<li><a
href="https://github.com/actions/first-interaction/commit/b2d4b15c5a811ea1f4bbad268da2bca2109189d7"><code>b2d4b15</code></a>
Licensed cache</li>
<li><a
href="https://github.com/actions/first-interaction/commit/27d1ab573741ae4c5f6754c10101173d25b5f53c"><code>27d1ab5</code></a>
Rebuild</li>
<li><a
href="https://github.com/actions/first-interaction/commit/6418932147dea53065542ff1a93c651148dc8124"><code>6418932</code></a>
Bump undici from 5.28.5 to 5.29.0</li>
<li>Additional commits viewable in <a
href="https://github.com/actions/first-interaction/compare/v1...v2">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/first-interaction&package-manager=github_actions&previous-version=1&new-version=2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>
2025-07-28 13:01:36 +02:00
dependabot[bot] 22e7d90285 Bump actions/first-interaction from 1 to 2
Bumps [actions/first-interaction](https://github.com/actions/first-interaction) from 1 to 2.
- [Release notes](https://github.com/actions/first-interaction/releases)
- [Commits](https://github.com/actions/first-interaction/compare/v1...v2)

---
updated-dependencies:
- dependency-name: actions/first-interaction
  dependency-version: '2'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-07-22 00:41:08 +00:00
kbz_8 f17a1b24e3 update dependencies (#144)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action
2025-07-03 10:58:06 +02:00
Kbz-8 85c3c844ea [BOT] update dependencies 2025-06-29 00:51:34 +00:00
kbz_8 14dee628c4 starting to work on headless support 2025-06-24 07:10:02 +02:00
kbz_8 e66c5482ea Indev (#142) 2025-06-23 20:46:06 +02:00
kbz_8 c474648da0 Merge branch 'master' into indev 2025-06-23 20:41:57 +02:00
kbz_8 c94513107b fixing image set pixel 2025-06-23 20:40:42 +02:00
kbz_8 ed794863d9 Merge branch 'master' of github.com:seekrs/MacroLibX 2025-06-23 20:35:45 +02:00
kbz_8 c7fba85393 fixing image set pixel 2025-06-23 20:35:36 +02:00
kbz_8 5650662d07 update dependencies (#140)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action
2025-06-01 11:16:11 +02:00
Kbz-8 640554981c [BOT] update dependencies 2025-06-01 00:54:50 +00:00
kbz_8 a9274fcb3e update dependencies (#139)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action
2025-05-18 12:54:08 +02:00
Kbz-8 3d6314253a [BOT] update dependencies 2025-05-18 00:46:40 +00:00
kbz_8 1a77df23ee update dependencies (#138)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action
2025-05-11 13:35:22 +02:00
Kbz-8 c16c4dc301 [BOT] update dependencies 2025-05-11 00:45:50 +00:00
kbz_8 7354a5ade4 update dependencies (#137)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action
2025-05-05 15:47:10 +02:00
Kbz-8 6c22b3e830 [BOT] update dependencies 2025-04-20 00:44:40 +00:00
kbz_8 0fdc36a6b7 update dependencies (#136)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action
2025-04-17 16:49:02 +02:00
Kbz-8 d2513834a2 [BOT] update dependencies 2025-04-06 00:43:23 +00:00
kbz_8 ba5ef31796 update dependencies (#135)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action
2025-03-23 15:00:05 +01:00
Kbz-8 29826e70ab [BOT] update dependencies 2025-03-23 00:42:57 +00:00
kbz_8 31d2054389 add rules in valgrind.supp (#134)
Hello,

Following my use of this library for my cub3D project, I noticed some
Valgrind issues that are not handled by the valgrind.supp file.
2025-03-19 11:31:27 +01:00
Jérémy Lorette 24c3faa88f add rules in valgrind.supp 2025-03-19 08:33:20 +01:00
kbz_8 44f2bbf6cd Indev (#133) 2025-03-17 11:34:58 +01:00
kbz_8 3e079cc0e9 fixing bug 2025-03-17 11:24:43 +01:00
kbz_8 025db7c2c8 yes 2025-03-14 12:41:51 +01:00
kbz_8 0628afa905 adding bindings (#132) 2025-03-13 17:11:33 +01:00
kbz_8 b05fb59e37 Merge branch 'master' into indev 2025-03-13 17:06:23 +01:00
kbz_8 2c73362fce adding bindings 2025-03-13 16:58:10 +01:00
kbz_8 f47db635e2 Indev (#131) 2025-03-13 00:47:48 +01:00
kbz_8 c72d44a8ea Merge branch 'indev' of github.com:seekrs/MacroLibX into indev 2025-03-13 00:43:47 +01:00
kbz_8 70d2426ed4 removing unnecessary mode in CIs 2025-03-13 00:43:34 +01:00
kbz_8 e89fe88d83 adding hidden bindings 2025-03-13 00:40:16 +01:00
kbz_8 19dbd4e203 Merge branch 'indev' of github.com:seekrs/MacroLibX into indev 2025-03-13 00:39:22 +01:00
kbz_8 093dabcbbb adding hidden bindings 2025-03-13 00:39:01 +01:00
kbz_8 096c0ae8cb Indev (#130) 2025-03-12 23:09:01 +01:00
kbz_8 ff76134422 Merge branch 'master' into indev 2025-03-12 23:03:14 +01:00
kbz_8 2345cf4417 adding secret bindings 2025-03-12 22:57:29 +01:00
kbz_8 4bd35e72fd Merge branch 'indev' of github.com:seekrs/MacroLibX into indev 2025-03-12 21:38:20 +01:00
kbz_8 2798a43674 yes 2025-03-12 21:37:59 +01:00
kbz_8 0c11d7a815 update dependencies (#129)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action
2025-03-10 08:49:06 +01:00
Kbz-8 ad4891f1f5 [BOT] update dependencies 2025-03-09 00:34:15 +00:00
kbz_8 e7d575046a Indev (#128) 2025-03-08 19:01:54 +01:00
kbz_8 f478bb4a9e Merge branch 'master' into indev 2025-03-08 18:53:58 +01:00
kbz_8 42e7e409db update dependencies (#124)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action
2025-02-24 08:13:09 +01:00
kbz_8 357c813b85 fix(Renderer/Image.cpp): bad moving_y bounds checking (#126) 2025-02-24 08:12:50 +01:00
kbz_8 daade1efc0 Revert "🐛 fix(Renderer/Image.cpp): bad moving_y bounds checking" (#125)
Reverts seekrs/MacroLibX#123
2025-02-24 08:12:05 +01:00
kbz_8 90a8dad18c Revert "🐛 fix(Renderer/Image.cpp): bad moving_y bounds checking" 2025-02-24 08:11:18 +01:00
kbz_8 fbc5bf0e45 🐛 fix(Renderer/Image.cpp): bad moving_y bounds checking (#123)
moved moving_y++ line
2025-02-24 08:11:10 +01:00
Kbz-8 43a727edf4 [BOT] update dependencies 2025-02-23 00:40:25 +00:00
Arkturius 6a959d8469 🐛 fix(Renderer/Image.cpp): bad moving_y bounds checking 2025-02-22 16:39:09 +01:00
kbz_8 cadf1669c8 update dependencies (#122)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action
2025-02-10 08:05:01 +01:00
Kbz-8 0b99c62bbf [BOT] update dependencies 2025-02-09 00:39:34 +00:00
kbz_8 0201d933fd update dependencies (#121)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action
2025-02-02 17:19:08 +01:00
Kbz-8 8a91d90b0d [BOT] update dependencies 2025-02-02 00:38:46 +00:00
kbz_8 0982ed814d update dependencies (#120)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action
2025-01-26 10:18:23 +01:00
Kbz-8 c5b1a80bd9 [BOT] update dependencies 2025-01-26 00:37:34 +00:00
kbz_8 3f5b42d301 fixing error message (#119) 2025-01-24 20:30:54 +01:00
kbz_8 69502db0ee fixing error message 2025-01-24 20:23:28 +01:00
kbz_8 c50925c64d Fix swapchain surface format selection (#118) 2025-01-22 10:11:02 +01:00
kbz_8 7e0664a28f yes 2025-01-21 21:27:13 +01:00
kbz_8 fdaaa86b7f fixing msvc compilation issue 2025-01-21 21:24:58 +01:00
kbz_8 3f8955f4b1 fixing swapchain surface format selection 2025-01-21 20:59:57 +01:00
kbz_8 baec65134c Merge branch 'indev' of github.com:seekrs/MacroLibX into indev 2025-01-21 15:12:30 +01:00
kbz_8 4462400b73 adding swapchain format to debug logs 2025-01-21 15:12:09 +01:00
kbz_8 9b0c3500c7 update dependencies (#117)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action
2025-01-19 20:48:42 +01:00
Kbz-8 157e555fb6 [BOT] update dependencies 2025-01-19 00:39:17 +00:00
kbz_8 2ae59b1b39 fixing too recent header (#116) 2025-01-12 21:17:31 +01:00
kbz_8 2c710058f3 fixing too recent header 2025-01-12 21:13:30 +01:00
kbz_8 d64be4a1f5 Indev (#115) 2025-01-12 18:39:09 +01:00
kbz_8 8c2e0cc69e fixing deps update 2025-01-12 12:30:43 +01:00
kbz_8 82dc92047f yes (#114) 2025-01-12 12:28:03 +01:00
kbz_8 3654cc67b1 update dependencies (#113)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action
2025-01-12 12:27:14 +01:00
Kbz-8 e46c2b99ec [BOT] update dependencies 2025-01-12 00:41:23 +00:00
kbz_8 2fdd9246db update README.md (#112) 2025-01-11 23:44:59 +01:00
kbz_8 e6fb5a72d2 update README.md 2025-01-11 23:44:37 +01:00
kbz_8 bc3d732208 Update README.md (#111) 2025-01-11 23:26:30 +01:00
kbz_8 23fc64a679 Update README.md 2025-01-11 23:26:20 +01:00
kbz_8 8bbe66528e release 2.0 (#110) 2025-01-11 23:15:04 +01:00
kbz_8 f4422c3174 fixing macOS issue 2025-01-11 23:04:58 +01:00
kbz_8 86709573fe fixing macOS issue 2025-01-11 22:47:26 +01:00
kbz_8 c8250629f3 fixing macOS issue 2025-01-11 22:42:40 +01:00
kbz_8 ef16cd3fdb fixing macOS issue 2025-01-11 22:28:39 +01:00
kbz_8 12c7469f52 fixing macOS issue 2025-01-11 22:23:20 +01:00
kbz_8 9443555cbb fixing macOS issue 2025-01-11 22:21:32 +01:00
kbz_8 023215aeed fixing macOS issue 2025-01-11 22:00:42 +01:00
kbz_8 bb523e8f66 fixing macOS issue 2025-01-11 21:49:30 +01:00
kbz_8 48da7003c9 fixing macOS issue 2025-01-11 21:44:17 +01:00
kbz_8 2137fc4ee7 fixing macOS issue 2025-01-11 21:42:50 +01:00
kbz_8 0f0ca48339 fixing haeder 2025-01-08 12:37:34 +01:00
kbz_8 deb6c20361 fixing transformations 2025-01-07 19:57:03 +01:00
kbz_8 b432e3e2e1 fixing possible segmentation fault in Texture::SetLinearRegion 2025-01-07 15:59:26 +01:00
kbz_8 1f482719e6 fixing things 2025-01-07 01:20:26 +01:00
kbz_8 3683a48e17 update dependencies (#109)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action
2025-01-05 12:05:19 +01:00
Kbz-8 94b46ac18c [BOT] update dependencies 2025-01-05 00:40:54 +00:00
kbz_8 6d34a7ffa6 update dependencies (#107)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action
2024-12-29 17:27:48 +01:00
Kbz-8 f4c186e724 [BOT] update dependencies 2024-12-29 00:41:02 +00:00
kbz_8 ce530c765e wtf is hapenning 2024-12-28 15:42:38 +01:00
kbz_8 d1d7f7ed98 Merge branch 'indev' of github.com:seekrs/MacroLibX into indev 2024-12-27 23:29:27 +01:00
kbz_8 49002fdd98 fixing vicious bug in scene code 2024-12-27 23:28:51 +01:00
kbz_8 45220a35fb update dependencies (#106)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action
2024-12-22 15:42:50 +01:00
Kbz-8 5244cde0ae [BOT] update dependencies 2024-12-22 00:40:37 +00:00
kbz_8 4e326db10d re-adding render to texture 2024-12-20 01:19:15 +01:00
kbz_8 952e48a05c fixing documentation in headers 2024-12-17 03:00:12 +01:00
kbz_8 62bd63c364 adding multiple hooks supports for events and loop 2024-12-17 02:33:04 +01:00
kbz_8 30f4602b1c fixing gcc/msvc error 2024-12-17 01:40:58 +01:00
kbz_8 393735b1d6 fixing gcc/msvc error 2024-12-17 01:03:00 +01:00
kbz_8 d40264891c fixing gcc/msvc error 2024-12-17 00:59:54 +01:00
kbz_8 6604cd647d changing endianness getter 2024-12-17 00:42:21 +01:00
kbz_8 f64ce376d6 implementing endianness check on mlx_color struct 2024-12-17 00:19:13 +01:00
kbz_8 c636229875 working on endianness with vulkan images 2024-12-17 00:11:21 +01:00
kbz_8 a85ad6378e fixing bug in texture clear 2024-12-16 19:07:16 +01:00
kbz_8 5a93cd4ae5 fixing homebrew path 2024-12-16 17:26:12 +01:00
kbz_8 4efe213fc6 revert 2024-12-16 17:22:34 +01:00
kbz_8 8721fe5000 installing SDL2 framework in macos action 2024-12-16 17:03:53 +01:00
kbz_8 a90bb88169 update action images 2024-12-16 16:57:23 +01:00
kbz_8 35b47936b4 fixing windows compilation issue 2024-12-16 16:39:50 +01:00
kbz_8 69bbed5b54 adding gcc13 to CI 2024-12-16 16:39:04 +01:00
kbz_8 024a9af55a fixing macos compilation issue 2024-12-16 16:17:17 +01:00
kbz_8 623021a669 implementing last functions, adding put pixel region 2024-12-16 16:13:44 +01:00
kbz_8 feb3fcbd1f finxing memory usages 2024-12-16 01:24:25 +01:00
kbz_8 5b726fe74a adding missing function implementation 2024-12-15 03:53:56 +01:00
kbz_8 5a36b90a72 reworking application and bridge 2024-12-15 03:35:17 +01:00
kbz_8 e365c8a48c rewritting parts of the API; ci skip 2024-12-14 16:38:44 +01:00
kbz_8 7bd2b9c4c7 working on garbage collection, fixing small issues with font destroy 2024-12-14 01:39:50 +01:00
kbz_8 f78c3e9f0f fixing valgrind issues, injecting garbage collector inside vulkan's funtions 2024-12-13 02:51:52 +01:00
kbz_8 34ea0822a7 moving experimental features to a new folder 2024-12-04 18:34:53 +01:00
kbz_8 f5ffd97e48 officially push 2.0 to test (#105) 2024-12-04 15:56:59 +01:00
kbz_8 6f57d9dab7 fetching deps 2024-12-04 15:56:38 +01:00
kbz_8 65fd92dca9 trying to fix merge conflicts 2024-12-04 15:55:11 +01:00
kbz_8 999ef64d0a working on subpass dependencies 2024-12-04 15:38:47 +01:00
kbz_8 33260f316f yes 2024-12-04 15:14:56 +01:00
kbz_8 3122576f04 enabling pre compiled header 2024-12-04 15:04:51 +01:00
kbz_8 92d060fc70 adding include check 2024-12-04 14:35:54 +01:00
kbz_8 57a7b10850 adding compiler version info to makefile header 2024-12-04 14:30:09 +01:00
kbz_8 777b92af8c adding missing include 2024-12-04 14:19:36 +01:00
kbz_8 b7183a1058 fixing window resizing 2024-12-04 14:04:44 +01:00
kbz_8 e425b66591 update dependencies (#104)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action
2024-12-03 14:35:12 +01:00
Kbz-8 8db78fc86b [BOT] update dependencies 2024-12-01 00:48:21 +00:00
kbz_8 122f4e8403 working on swapchains 2024-11-26 23:11:03 +01:00
kbz_8 843856d004 update dependencies (#103)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action
2024-11-24 18:11:21 +01:00
Kbz-8 afc17be8e4 [BOT] update dependencies 2024-11-24 00:41:50 +00:00
kbz_8 0b492d5d47 yes (#102) 2024-11-22 15:37:01 +01:00
kbz_8 8c63e316ef Edit valgrind.supp for libdbus & libnvidia leak (#101)
Added rules in valgrind.supp for libdbus.so & libnvidia leaks
2024-11-22 15:35:43 +01:00
Thomas Arnaud 375fa0f49e Edit valgrind.supp for libdbus & libnvidia lib 2024-11-22 13:59:35 +01:00
kbz_8 32b6053cfb working on rtt 2024-11-14 17:38:44 +01:00
kbz_8 ef50272a0c fixing rotation 2024-11-14 11:44:52 +01:00
kbz_8 c6aaa4e2fa fixing linux build failure 2024-11-13 12:23:16 +01:00
kbz_8 e29ea92202 adding transformations 2024-11-13 12:17:59 +01:00
kbz_8 eaf5be3061 adding nesting to debug logs 2024-11-05 12:49:21 +01:00
kbz_8 4ae7bd0420 improving BringToLayer 2024-11-05 11:59:31 +01:00
kbz_8 5f46c8cb55 fixing bug with image recreation 2024-11-05 11:50:40 +01:00
kbz_8 e8de2c169d adding clear color in mlx_clear_window 2024-11-04 21:21:46 +01:00
kbz_8 bccfb8cd90 update dependencies (#100)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action
2024-11-04 17:50:11 +01:00
Kbz-8 f3efdd8d72 [BOT] update dependencies 2024-11-03 00:40:16 +00:00
kbz_8 b59888efb3 yes 2024-11-03 01:23:52 +01:00
kbz_8 a662427097 added show and hide cursor support, fixing technological debt from original mlx, fixed missaligned comments in mlx.h 2024-10-31 15:16:01 +01:00
kbz_8 6669d78323 updating example 2024-10-31 13:07:07 +01:00
kbz_8 de30c11157 fixing texts 2024-10-31 12:54:05 +01:00
kbz_8 5cf965b9a1 yes 2024-10-31 12:36:44 +01:00
kbz_8 2854b19296 yes 2024-10-28 20:19:39 +01:00
kbz_8 d167538b3f yes 2024-10-28 20:17:39 +01:00
kbz_8 9dfe72f27c Fixing layering issues with text and textures (#99)
![image](https://github.com/user-attachments/assets/804d7dfa-90fd-4d61-b448-61ffa30ed00f)
2024-10-28 20:16:49 +01:00
Namonay 00fccf011e Formatting 2024-10-28 20:02:42 +01:00
Namonay a1bc4a801d Cleaned code 2024-10-28 00:29:11 +01:00
Namonay 8c287e4cbc add: bring textures to draw layer
Adding the Scene::BringToDrawLayer() to fix layering issues after a Scene::ResetScene() call
2024-10-27 23:12:07 +01:00
kbz_8 fed7111362 fixing segfault at exit 2024-10-27 21:18:22 +01:00
kbz_8 dbf4d3cc5b pushing for vavaas to debug 2024-10-27 20:55:21 +01:00
kbz_8 9499ade4c0 update dependencies (#98)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action
2024-10-27 11:42:45 +01:00
Kbz-8 e470e4c43c [BOT] update dependencies 2024-10-27 00:40:14 +00:00
kbz_8 028cb57ff4 working on texts and fonts 2024-10-27 01:14:07 +02:00
kbz_8 625e23e624 feature(platform/window.cpp): put SDL_CreateWindow flags in a define (#97) 2024-10-27 00:42:33 +02:00
kbz_8 7114522d80 fixed code style 2024-10-27 00:34:41 +02:00
killian 1c073eb8eb feature(platform/window.cpp): put SDL_CreateWindow flags in a define
Signed-off-by: killian <oss@xtrm.me>
2024-10-27 00:32:22 +02:00
kbz_8 3aaa5df929 2.0 devFixing putpixel and put image overlapping incorrectly after a mlx_clear_window() call (#96)
Fixed m_draw_layer incrementation when TexturePut is called
2024-10-25 23:23:37 +02:00
Namonay 3828b98a60 Merge branch 'seekrs:2.0-dev' into 2.0-dev 2024-10-25 23:08:55 +02:00
kbz_8 da41f2836f yes 2024-10-24 19:13:02 +02:00
Namonay 2dadf5d29a better naming and removed todo🤓 2024-10-24 05:30:37 +02:00
Namonay 1ec2f72d26 this feels wrong 2024-10-24 05:16:37 +02:00
Namonay b0384830a9 Merge branch '2.0-dev' of github.com:Namonay/MacroLibX into 2.0-dev 2024-10-24 05:15:57 +02:00
Namonay e1fefba841 this feel so wrong 2024-10-24 05:13:41 +02:00
kbz_8 58ad52e1cc yes 2024-10-22 16:25:13 +02:00
kbz_8 a86f26f0f3 fixing compilation issues 2024-10-22 12:09:49 +02:00
kbz_8 92743b0b03 working on fonts 2024-10-21 23:21:50 +02:00
kbz_8 3291e0cd2a bozoman solution 2024-10-21 21:58:04 +02:00
kbz_8 7a3e5f37fa yes 2024-10-21 19:45:33 +02:00
kbz_8 0304834008 fixing put pixel, adding scene change checker 2024-10-21 01:48:01 +02:00
kbz_8 049eb3e33c update dependencies (#95)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action
2024-10-20 02:42:25 +02:00
Kbz-8 66024349cb [BOT] update dependencies 2024-10-20 00:40:22 +00:00
kbz_8 e1af24a3ef fixing crash when initializing mlx multiple times (#94) 2024-10-19 10:57:39 +02:00
kbz_8 40b82243ba Merge branch 'master' into indev 2024-10-19 10:52:55 +02:00
kbz_8 ecb0a15e74 fetching deps once a week 2024-10-19 10:51:33 +02:00
kbz_8 12b832ee31 fixing crash when initializing the mlx multiple times 2024-10-19 10:50:50 +02:00
kbz_8 4f755f8a6f yes 2024-10-19 10:46:31 +02:00
kbz_8 a905f571dc update dependencies (#92)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action
2024-10-19 00:44:08 +02:00
kbz_8 386d9abe4b yes 2024-10-19 00:43:39 +02:00
kbz_8 d0a74e79c5 fixing inputs bug, fixing missing depth image destruction in scenes 2024-10-17 18:35:33 +02:00
kbz_8 160364bda2 fixing projection issue 2024-10-17 15:37:39 +02:00
Kbz-8 ec2f1101f0 [BOT] update dependencies 2024-10-12 01:21:00 +00:00
kbz_8 568b5a85ce update dependencies (#91)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action
2024-10-08 05:29:49 +02:00
Kbz-8 f2cbd6679d [BOT] update dependencies 2024-10-08 01:23:20 +00:00
kbz_8 2e93798948 update dependencies (#90)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action
2024-10-07 06:09:15 +02:00
Kbz-8 d4ea03e047 [BOT] update dependencies 2024-10-07 01:25:31 +00:00
kbz_8 5866f5ac25 update dependencies (#89)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action
2024-10-06 07:50:37 +02:00
Kbz-8 53650f3153 [BOT] update dependencies 2024-10-06 01:35:52 +00:00
kbz_8 cc8fb1bbb3 update dependencies (#88)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action
2024-10-06 02:05:35 +02:00
Kbz-8 a3334277c6 [BOT] update dependencies 2024-10-05 01:22:08 +00:00
kbz_8 a593838c4d dumbass (#87) 2024-09-30 03:26:07 +02:00
xtrm b4e61e1875 Update mlx.h 2024-09-30 03:15:44 +02:00
kbz_8 ef72083bd0 update dependencies (#86)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action
2024-09-28 22:03:43 +02:00
Kbz-8 b0924861aa [BOT] update dependencies 2024-09-27 01:23:16 +00:00
kbz_8 99437a6d6a adding shaders compilation in makefile 2024-09-22 21:39:20 +02:00
kbz_8 ad35eee0b6 fixing release compilation issue 2024-09-21 12:56:21 +02:00
kbz_8 904b6d31ac adding debug vulkan resources names 2024-09-21 12:18:42 +02:00
kbz_8 2e08c37624 fixing bugs 2024-09-20 21:43:23 +02:00
kbz_8 f9c05d6d7b fixing kvf issues 2024-09-20 17:41:52 +02:00
kbz_8 1e2705ef06 removing all singletons 2024-09-20 17:29:42 +02:00
kbz_8 8348f9ce7a fixing SDLManager 2024-09-20 17:02:55 +02:00
kbz_8 092e5acd9b fixing vulkan loader, moving vulkan pfns to RenderCore 2024-09-20 16:14:14 +02:00
kbz_8 f4e4672cc6 working on vulkan loader 2024-09-16 05:07:02 +02:00
kbz_8 fcb2d1d9bc fixing warnings in kvf 2024-09-15 10:11:08 +02:00
kbz_8 a4b14baddd fixing compilation issues 2024-09-15 09:03:52 +02:00
kbz_8 596393ed20 implementing mouse move and get screen size, removing warnings 2024-09-15 08:56:22 +02:00
kbz_8 2b9b026d68 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHHHHHHHHHHHHH 2024-09-15 07:56:28 +02:00
kbz_8 4c17f2e165 fixing windows build x3 | replacing compile commands by compile flags 2024-09-15 07:52:25 +02:00
kbz_8 91b51a5621 fixing windows build x2 2024-09-14 13:20:31 +02:00
kbz_8 976afdac3d fixing windows build 2024-09-14 13:14:36 +02:00
kbz_8 429bd9eabd fixing macos and windows CI ? x3 2024-09-14 13:04:43 +02:00
kbz_8 30e07d1f1a fixing macos and windows CI ? 2024-09-14 12:53:29 +02:00
kbz_8 48d09e40d5 fixing macos and windows CI ? 2024-09-14 12:44:25 +02:00
kbz_8 7f2d60f21d fixing compilation issues 2024-09-14 09:55:19 +02:00
kbz_8 a4801fbce8 merge indev into master (#84) 2024-09-14 00:45:30 +02:00
kbz_8 760317dcc7 fixing compilation issues with GCC 2024-09-14 00:05:50 +02:00
kbz_8 520ce8d61e resolving merge (#83) 2024-09-13 23:54:58 +02:00
kbz_8 cd29248fc6 yes 2024-09-13 23:51:01 +02:00
kbz_8 7db31b13c2 adding support for changing window position (#82)
added window move function
2024-09-12 21:00:40 +02:00
kbz_8 4f6886517e fixing codestyle in application.inl 2024-09-12 03:32:08 +02:00
Tidian Delage d87d4fbd6a adding support for changing window position
mlx_set_window_position(void *mlx, void *win, int x, int y)
2024-09-12 01:32:52 +02:00
kbz_8 aa09d9d83f update dependencies (#80)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action
2024-09-07 05:17:36 +02:00
Kbz-8 34b4d2bda0 [BOT] update dependencies 2024-09-07 01:17:30 +00:00
kbz_8 8888bd03d8 fixing compilation issues 2024-09-05 00:41:52 +02:00
kbz_8 8ad6d84bd2 fixing compilation issues, working on textures 2024-09-04 02:35:01 +02:00
kbz_8 e0da415e86 starting to fix compilation issues 2024-09-02 13:36:02 +02:00
kbz_8 a455d7704d adding depth buffer, ci skip 2024-09-02 13:02:32 +02:00
kbz_8 f65ac577bc big refactoring ! ci skip 2024-09-02 09:44:42 +02:00
kbz_8 06372a84ed update dependencies (#79)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action
2024-09-02 09:42:20 +02:00
Kbz-8 1dae0931f7 [BOT] update dependencies 2024-08-31 01:18:08 +00:00
kbz_8 3d8ab31abb update dependencies (#75)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action
2024-08-22 23:13:32 +02:00
Kbz-8 5dcb7402e1 [BOT] update dependencies 2024-08-17 01:12:49 +00:00
kbz_8 8b9ef40f99 Add <algorithm> header to fix compilation issue on Arch Linux (#76)
The code was failing to compile on Arch Linux due to missing definitions
from the <algorithm> header. Including this header resolves the issue,
ensuring compatibility across different environments.
2024-08-08 18:10:22 +02:00
bonsthie 1fe21e7725 Add <algorithm> header to fix compilation issue on Arch Linux
The code was failing to compile on Arch Linux due to missing definitions from the <algorithm> header. Including this header resolves the issue, ensuring compatibility across different environments.
2024-08-08 17:49:14 +02:00
kbz_8 bea16a2dc1 update dependencies (#74)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action
2024-07-20 09:58:01 +02:00
Kbz-8 1ddad73356 [BOT] update dependencies 2024-07-19 15:46:30 +00:00
kbz_8 538cd96eda update dependencies (#73)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action
2024-07-13 03:50:02 +02:00
Kbz-8 3668515e9b [BOT] update dependencies 2024-07-13 01:13:25 +00:00
kbz_8 d95233e728 fixing compoilation issues 2024-07-05 22:15:36 +02:00
kbz_8 d209747978 update dependencies (#72)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action
2024-07-05 12:59:44 +02:00
Kbz-8 00c87a61a3 [BOT] update dependencies 2024-07-02 01:12:05 +00:00
kbz_8 e930b3b0be update dependencies (#71)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action
2024-07-01 22:07:45 +02:00
Kbz-8 0795200910 [BOT] update dependencies 2024-06-29 01:10:23 +00:00
kbz_8 dd36a878cd update dependencies (#70)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action
2024-06-17 19:32:26 +02:00
Kbz-8 470f3a3a3c [BOT] update dependencies 2024-06-15 01:10:51 +00:00
kbz_8 3a3b4e063a update dependencies (#69)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action
2024-06-08 05:01:50 +02:00
Kbz-8 eb158d01c7 [BOT] update dependencies 2024-06-08 01:10:19 +00:00
kbz_8 905ab698cb update dependencies (#68)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action
2024-06-04 14:44:26 +02:00
Kbz-8 d535faaaf7 [BOT] update dependencies 2024-06-01 01:13:48 +00:00
kbz_8 c427c46e24 update dependencies (#67)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action
2024-05-29 18:23:43 +02:00
Kbz-8 e32c65d918 [BOT] update dependencies 2024-05-28 01:08:56 +00:00
kbz_8 81387ec53d removing GLFW support 2024-05-25 16:47:28 +02:00
kbz_8 850b47f6cf update dependencies (#65)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action
2024-05-25 14:58:18 +02:00
Kbz-8 1641a48e4e [BOT] update dependencies 2024-05-23 01:08:01 +00:00
kbz_8 9ef9cd897d 🐛 fix(vsupp): dl and dbus errors suppressed (#66)
ehehheheheh
2024-05-22 18:53:36 +02:00
Arkturius b93d0753c6 🐛 fix(vsupp): dl and dbus errors suppressed 2024-05-22 18:30:59 +02:00
killian 710634ced6 feature(Makefile): change color when compiling in debug 2024-04-24 15:00:22 +02:00
killian d616adb466 feature(Makefile): remove bc dependency, allow usage of -j with make re 2024-04-24 14:57:20 +02:00
kbz_8 e7eb894335 fixing segmentation fault on mlx_destroy_image 2024-04-24 13:52:34 +02:00
kbz_8 afee09d1ea still refactor 2024-04-24 13:47:58 +02:00
kbz_8 1d9a51e4f7 still working on code refactoring 2024-04-23 22:59:33 +02:00
kbz_8 10f1b865bd Cool Makefile I guess (#64)
yada yada yada
2024-04-23 22:52:09 +02:00
xtrm 920e0f5e66 🔨 chore: mauvaisfeedback 2024-04-23 22:46:32 +02:00
kbz_8 ace4c98945 working on code refactor 2024-04-23 20:59:50 +02:00
xtrm a7aa05fcbe 🔨 chore(actions): change usage of DEBUG=true to the debug rule 2024-04-23 20:42:39 +02:00
xtrm 7f7b6704ce 🐛 fix(Makefile): optimize color usage 2024-04-23 20:38:26 +02:00
xtrm 291927a1cc 🐛 fix(actions): try and fix logging in GitHub Actions CI 2024-04-23 20:37:17 +02:00
xtrm 280e3b43d3 🔨 chore(render_core.cpp): revert moving the warning to Makefile 2024-04-23 20:33:11 +02:00
xtrm 969555d572 feature(Makefile): pretty makefile, added -rdynamic LDFLAG, moved debug warning, added debug Makefile rule 2024-04-23 20:21:53 +02:00
kbz_8 a69ea93597 fixing multiple window issue 2024-04-22 17:35:41 +02:00
kbz_8 610603e87c update dependencies (#62)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action
2024-04-22 12:57:49 +02:00
Kbz-8 58c082f033 [BOT] update dependencies 2024-04-22 01:07:14 +00:00
kbz_8 e09797a1a6 merge indev to master (#61) 2024-04-21 18:20:21 +02:00
kbz_8 2c01c67361 Merge branch 'master' into indev 2024-04-21 18:15:25 +02:00
kbz_8 7271b8fc9a update dependencies (#60)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action
2024-04-21 18:14:31 +02:00
kbz_8 67d7635a32 fixing bug with window destruction within mlx_loop 2024-04-21 18:14:14 +02:00
kbz_8 215a0dc2c3 working 2024-04-21 18:10:36 +02:00
Kbz-8 39d38c822b [BOT] update dependencies 2024-04-20 01:04:56 +00:00
kbz_8 6bbf1e196d begenning the refactor 2024-03-27 23:03:54 +01:00
kbz_8 e5ff232065 renaming MLX_Window to Window 2024-03-27 13:19:28 +01:00
kbz_8 4af38a2c7e working glfw support 2024-03-26 00:11:38 +01:00
kbz_8 2200863406 fixing pch compilation error 2024-03-25 19:27:48 +01:00
kbz_8 d9a00dee22 fixing pch compilation error 2024-03-25 19:24:37 +01:00
kbz_8 f7946eea68 fixing pre compiled header usage, improved compilation time 2024-03-25 19:21:14 +01:00
kbz_8 c26c6f952b adding pre compiled header 2024-03-25 18:58:48 +01:00
kbz_8 54435be20d working on fps capper 2024-03-25 17:33:42 +01:00
kbz_8 be2a7d5157 fixing new gcc warning in GPU allocator, fixing #55 2024-03-25 16:18:24 +01:00
kbz_8 7011a6ee6e fixing some bad memory usage 2024-03-25 13:57:20 +01:00
kbz_8 235292b440 update dependencies (#59)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action
2024-03-24 23:04:44 +01:00
Kbz-8 d9e88f70c7 [BOT] update dependencies 2024-03-23 01:01:59 +00:00
kbz_8 e8c80eccab update dependencies (#57)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action
2024-03-15 15:42:44 +01:00
Kbz-8 fa7f16744d [BOT] update dependencies 2024-03-09 01:00:27 +00:00
kbz_8 105b32b710 The bro did it again (#54) 2024-02-25 09:40:47 +01:00
kbz_8 75bca5bf6f Merge branch 'master' into indev 2024-02-25 09:35:31 +01:00
kbz_8 c5a5a029af removing debug print 2024-02-25 09:30:30 +01:00
kbz_8 6000b3e3c1 merge to master (#53) 2024-02-25 09:15:29 +01:00
kbz_8 7b64359f3e fixing issue with text destruction 2024-02-25 09:02:57 +01:00
kbz_8 3624caf519 adding std namespace to all libstd provided primitive types 2024-02-25 08:04:44 +01:00
kbz_8 828024e131 removing unecessary SDL window creation in Vulkan Instance creation 2024-02-24 04:47:05 +01:00
kbz_8 784156c395 fixing weird color bug with mlx_get_image_pixel 2024-02-24 03:58:12 +01:00
kbz_8 b53b36e07a update dependencies (#50)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action
2024-02-18 21:42:23 +01:00
Kbz-8 3bb167e164 [BOT] update dependencies 2024-02-17 01:02:17 +00:00
kbz_8 fe9dd3c9df sync (#49) 2024-02-10 03:12:08 +01:00
kbz_8 132e539d4a Bump peter-evans/create-pull-request from 5 to 6 (#48)
Bumps
[peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request)
from 5 to 6.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/peter-evans/create-pull-request/releases">peter-evans/create-pull-request's
releases</a>.</em></p>
<blockquote>
<h2>Create Pull Request v6.0.0</h2>
<h2>Behaviour changes</h2>
<ul>
<li>The default values for <code>author</code> and
<code>committer</code> have changed. See &quot;What's new&quot; below
for details. If you are overriding the default values you will not be
affected by this change.</li>
<li>On completion, the action now removes the temporary git remote
configuration it adds when using <code>push-to-fork</code>. This should
not affect you unless you were using the temporary configuration for
some other purpose after the action completes.</li>
</ul>
<h2>What's new</h2>
<ul>
<li>Updated runtime to Node.js 20
<ul>
<li>The action now requires a minimum version of <a
href="https://github.com/actions/runner/releases/tag/v2.308.0">v2.308.0</a>
for the Actions runner. Update self-hosted runners to v2.308.0 or later
to ensure compatibility.</li>
</ul>
</li>
<li>The default value for <code>author</code> has been changed to
<code>${{ github.actor }} &lt;${{ github.actor_id }}+${{ github.actor
}}@users.noreply.github.com&gt;</code>. The change adds the <code>${{
github.actor_id }}+</code> prefix to the email address to align with
GitHub's standard format for the author email address.</li>
<li>The default value for <code>committer</code> has been changed to
<code>github-actions[bot]
&lt;41898282+github-actions[bot]@users.noreply.github.com&gt;</code>.
This is to align with the default GitHub Actions bot user account.</li>
<li>Adds input <code>git-token</code>, the <a
href="https://docs.github.com/en/github/authenticating-to-github/creating-a-personal-access-token">Personal
Access Token (PAT)</a> that the action will use for git operations. This
input defaults to the value of <code>token</code>. Use this input if you
would like the action to use a different token for git operations than
the one used for the GitHub API.</li>
<li><code>push-to-fork</code> now supports pushing to sibling
repositories in the same network.</li>
<li>Previously, when using <code>push-to-fork</code>, the action did not
remove temporary git remote configuration it adds during execution. This
has been fixed and the configuration is now removed when the action
completes.</li>
<li>If the pull request body is truncated due to exceeding the maximum
length, the action will now suffix the body with the message
&quot;...<em>[Pull request body truncated]</em>&quot; to indicate that
the body has been truncated.</li>
<li>The action now uses <code>--unshallow</code> only when necessary,
rather than as a default argument of <code>git fetch</code>. This should
improve performance, particularly for large git repositories with
extensive commit history.</li>
<li>The action can now be executed on one GitHub server and create pull
requests on a <em>different</em> GitHub server. Server products include
GitHub hosted (github.com), GitHub Enterprise Server (GHES), and GitHub
Enterprise Cloud (GHEC). For example, the action can be executed on
GitHub hosted and create pull requests on a GHES or GHEC instance.</li>
</ul>
<h2>What's Changed</h2>
<ul>
<li>Update distribution by <a
href="https://github.com/actions-bot"><code>@​actions-bot</code></a> in
<a
href="https://redirect.github.com/peter-evans/create-pull-request/pull/2086">peter-evans/create-pull-request#2086</a></li>
<li>fix crazy-max/ghaction-import-gp parameters by <a
href="https://github.com/fharper"><code>@​fharper</code></a> in <a
href="https://redirect.github.com/peter-evans/create-pull-request/pull/2177">peter-evans/create-pull-request#2177</a></li>
<li>Update distribution by <a
href="https://github.com/actions-bot"><code>@​actions-bot</code></a> in
<a
href="https://redirect.github.com/peter-evans/create-pull-request/pull/2364">peter-evans/create-pull-request#2364</a></li>
<li>Use checkout v4 by <a
href="https://github.com/okuramasafumi"><code>@​okuramasafumi</code></a>
in <a
href="https://redirect.github.com/peter-evans/create-pull-request/pull/2521">peter-evans/create-pull-request#2521</a></li>
<li>Note about <code>delete-branch</code> by <a
href="https://github.com/dezren39"><code>@​dezren39</code></a> in <a
href="https://redirect.github.com/peter-evans/create-pull-request/pull/2631">peter-evans/create-pull-request#2631</a></li>
<li>98 dependency updates by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a href="https://github.com/fharper"><code>@​fharper</code></a> made
their first contribution in <a
href="https://redirect.github.com/peter-evans/create-pull-request/pull/2177">peter-evans/create-pull-request#2177</a></li>
<li><a
href="https://github.com/okuramasafumi"><code>@​okuramasafumi</code></a>
made their first contribution in <a
href="https://redirect.github.com/peter-evans/create-pull-request/pull/2521">peter-evans/create-pull-request#2521</a></li>
<li><a href="https://github.com/dezren39"><code>@​dezren39</code></a>
made their first contribution in <a
href="https://redirect.github.com/peter-evans/create-pull-request/pull/2631">peter-evans/create-pull-request#2631</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/peter-evans/create-pull-request/compare/v5.0.2...v6.0.0">https://github.com/peter-evans/create-pull-request/compare/v5.0.2...v6.0.0</a></p>
<h2>Create Pull Request v5.0.2</h2>
<p>⚙️ Fixes an issue that occurs when using <code>push-to-fork</code>
and both base and head repositories are in the same org/user
account.</p>
<h2>What's Changed</h2>
<ul>
<li>fix: specify head repo by <a
href="https://github.com/peter-evans"><code>@​peter-evans</code></a> in
<a
href="https://redirect.github.com/peter-evans/create-pull-request/pull/2044">peter-evans/create-pull-request#2044</a></li>
<li>20 dependency updates by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/peter-evans/create-pull-request/compare/v5.0.1...v5.0.2">https://github.com/peter-evans/create-pull-request/compare/v5.0.1...v5.0.2</a></p>
<h2>Create Pull Request v5.0.1</h2>
<h2>What's Changed</h2>
<ul>
<li>fix: truncate body if exceeds max length by <a
href="https://github.com/peter-evans"><code>@​peter-evans</code></a> in
<a
href="https://redirect.github.com/peter-evans/create-pull-request/pull/1915">peter-evans/create-pull-request#1915</a></li>
<li>12 dependency updates by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/peter-evans/create-pull-request/compare/v5.0.0...v5.0.1">https://github.com/peter-evans/create-pull-request/compare/v5.0.0...v5.0.1</a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/peter-evans/create-pull-request/commit/b1ddad2c994a25fbc81a28b3ec0e368bb2021c50"><code>b1ddad2</code></a>
feat: v6 (<a
href="https://redirect.github.com/peter-evans/create-pull-request/issues/2717">#2717</a>)</li>
<li><a
href="https://github.com/peter-evans/create-pull-request/commit/bb809027fda03cc267431a7d36a88148eb9f3846"><code>bb80902</code></a>
build(deps-dev): bump <code>@​types/node</code> from 18.19.8 to 18.19.10
(<a
href="https://redirect.github.com/peter-evans/create-pull-request/issues/2712">#2712</a>)</li>
<li><a
href="https://github.com/peter-evans/create-pull-request/commit/e0037d470cdeb1c8133acfba89af08639bb69eb3"><code>e0037d4</code></a>
build(deps): bump peter-evans/create-or-update-comment from 3 to 4 (<a
href="https://redirect.github.com/peter-evans/create-pull-request/issues/2702">#2702</a>)</li>
<li><a
href="https://github.com/peter-evans/create-pull-request/commit/94b1f99e3a73880074d0e669c3b69d376cc8ceae"><code>94b1f99</code></a>
build(deps): bump peter-evans/find-comment from 2 to 3 (<a
href="https://redirect.github.com/peter-evans/create-pull-request/issues/2703">#2703</a>)</li>
<li><a
href="https://github.com/peter-evans/create-pull-request/commit/69c27eaf4a14a67b5362a51e681f83d3d5e0f96b"><code>69c27ea</code></a>
build(deps-dev): bump ts-jest from 29.1.1 to 29.1.2 (<a
href="https://redirect.github.com/peter-evans/create-pull-request/issues/2685">#2685</a>)</li>
<li><a
href="https://github.com/peter-evans/create-pull-request/commit/7ea722a0f6286a45eb3005280d83575a74bc8fef"><code>7ea722a</code></a>
build(deps-dev): bump prettier from 3.2.2 to 3.2.4 (<a
href="https://redirect.github.com/peter-evans/create-pull-request/issues/2684">#2684</a>)</li>
<li><a
href="https://github.com/peter-evans/create-pull-request/commit/5ee839affd4c87811108724370a2819a40e2e5d3"><code>5ee839a</code></a>
build(deps-dev): bump <code>@​types/node</code> from 18.19.7 to 18.19.8
(<a
href="https://redirect.github.com/peter-evans/create-pull-request/issues/2683">#2683</a>)</li>
<li><a
href="https://github.com/peter-evans/create-pull-request/commit/60fc256c678e6ed78d0d42e09675c9beba09cb94"><code>60fc256</code></a>
build(deps-dev): bump eslint-plugin-prettier from 5.1.2 to 5.1.3 (<a
href="https://redirect.github.com/peter-evans/create-pull-request/issues/2660">#2660</a>)</li>
<li><a
href="https://github.com/peter-evans/create-pull-request/commit/0c677233614c017442253060c74fd2cb7ff349fc"><code>0c67723</code></a>
build(deps-dev): bump <code>@​types/node</code> from 18.19.5 to 18.19.7
(<a
href="https://redirect.github.com/peter-evans/create-pull-request/issues/2661">#2661</a>)</li>
<li><a
href="https://github.com/peter-evans/create-pull-request/commit/4e288e851b95bd1362e281a255094fcc47ada675"><code>4e288e8</code></a>
build(deps-dev): bump prettier from 3.1.1 to 3.2.2 (<a
href="https://redirect.github.com/peter-evans/create-pull-request/issues/2659">#2659</a>)</li>
<li>Additional commits viewable in <a
href="https://github.com/peter-evans/create-pull-request/compare/v5...v6">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=peter-evans/create-pull-request&package-manager=github_actions&previous-version=5&new-version=6)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>
2024-02-05 23:17:30 +01:00
dependabot[bot] 916b0fbcb5 Bump peter-evans/create-pull-request from 5 to 6
Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 5 to 6.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/v5...v6)

---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-02-05 22:10:30 +00:00
kbz_8 ea4793c403 update dependencies (#47)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action
2024-02-02 15:21:14 +01:00
Kbz-8 7b9ee3d49f [BOT] update dependencies 2024-02-02 01:03:23 +00:00
kbz_8 599f9414ae adding check to texture pointers (#46) 2024-01-26 12:11:47 +01:00
kbz_8 d6e4ef1976 Merge branch 'master' into indev 2024-01-26 12:07:15 +01:00
kbz_8 9c0e7dfd21 update dependencies (#45)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action
2024-01-26 12:01:23 +01:00
kbz_8 1dd24f687c adding check to texture pointers 2024-01-26 11:59:57 +01:00
Kbz-8 1e2f2880ae [BOT] update dependencies 2024-01-26 01:04:35 +00:00
kbz_8 eaf2d00864 yes (#43) 2024-01-24 17:54:37 +01:00
kbz_8 528867bc7b Merge branch 'master' into indev 2024-01-24 17:49:53 +01:00
kbz_8 fab193db38 yes 2024-01-24 17:49:38 +01:00
kbz_8 3f4dcad12f adding rule to gitignore 2024-01-20 08:54:28 +01:00
kbz_8 a461624fea improving descriptor sets and pools management (#41) 2024-01-20 08:53:13 +01:00
kbz_8 77ab3bf68c improving descriptor sets and pools management 2024-01-20 08:46:50 +01:00
kbz_8 982b8c17f4 adding fps capper (#40) 2024-01-18 15:31:37 +01:00
kbz_8 d857d598e8 Merge branch 'master' into indev 2024-01-18 15:28:20 +01:00
kbz_8 a3af54f271 adding fps capper 2024-01-18 15:25:13 +01:00
kbz_8 48133e3432 fixing texts allocation issues (#39) 2024-01-18 14:23:05 +01:00
kbz_8 6143e8b1c5 Merge branch 'master' into indev 2024-01-18 13:59:37 +01:00
kbz_8 dd0599c088 fixing allocation issues with texts 2024-01-18 13:57:41 +01:00
Kbz-8 208b0e4710 fixing shit 2024-01-17 07:41:15 +01:00
kbz_8 209472d0a1 i dont know chat i did i was high as f*ck 2024-01-17 05:30:38 +01:00
kbz_8 708e509bfa fixing issue with swapchain recreation 2024-01-16 07:19:27 +01:00
kbz_8 47aead9e2d oh the misery (#38)
Fixed a bug and modified the example/main.c to test all mlx functions 

![image](https://github.com/seekrs/MacroLibX/assets/105780726/d9946f1f-4e97-453f-87a6-953ffd0ad52d)
2024-01-12 14:56:14 +01:00
Namonay 9024b9cc12 upgraded example to test all mlx functions 2024-01-12 04:25:12 +01:00
Namonay 0bd6f17260 Fixed mlx_mouse_move() not updating mouse position
Removed SDL_FlushEvent(SDL_MOUSEMOTION) preventing Input::update() from catching new mouse position after a mlx_mouse_move() call
2024-01-12 04:24:24 +01:00
kbz_8 a0d5cea21f Preventing some segfaults (#37)
![nerd](https://github.com/seekrs/MacroLibX/assets/105780726/74152e81-029a-4f35-afda-11e6411646bf)
2024-01-12 01:51:51 +01:00
Namonay 2c9c4217ec Merge branch 'seekrs:indev' into indev 2024-01-12 01:28:25 +01:00
Namonay 39298eda36 Added protections to THE bridge 2024-01-12 01:27:02 +01:00
kbz_8 99e6267489 improving vsupp 2024-01-12 00:49:42 +01:00
kbz_8 4835ff0337 Indev (#36) 2024-01-11 15:53:39 +01:00
kbz_8 7f1dd999bf Merge branch 'master' into indev 2024-01-11 15:48:15 +01:00
kbz_8 088e1891fc fixing compilation error 2024-01-11 15:47:45 +01:00
kbz_8 18d0f102ec fixing vsupp missing character 2024-01-11 15:46:11 +01:00
kbz_8 e060cf39f9 merge indev to master (#35) 2024-01-11 05:32:13 +01:00
kbz_8 7de0758f76 Merge branch 'master' into indev 2024-01-11 05:27:21 +01:00
kbz_8 189764dc34 new text management, texts and textures are on the same level, new texture rendering management, fixing issues 2024-01-11 05:23:16 +01:00
kbz_8 875d73e3dd fixing color management issue with texts 2024-01-10 20:22:53 +01:00
kbz_8 62c623d70a adding xmake profiler option 2024-01-10 18:49:54 +01:00
kbz_8 05ba165c45 adding profiler (#34) 2024-01-10 18:48:52 +01:00
kbz_8 944038e564 fixing windows compilation issue 2024-01-10 18:37:14 +01:00
kbz_8 fb6bda24a6 adding profiler 2024-01-10 18:32:40 +01:00
kbz_8 c3ffb80a10 Indev (#33)
Indev
2024-01-09 01:42:36 +01:00
Namonay 0acb086819 added back not so much 'unnecesary' include 2024-01-09 01:37:01 +01:00
Namonay b14468eed1 removed useless includes 🤓 2024-01-09 01:28:50 +01:00
Namonay f9d1234642 update buid.sh 2024-01-09 01:01:31 +01:00
Namonay 44d76a3b9e Fixed brief typo 2024-01-09 00:31:39 +01:00
kbz_8 aa97d048b8 fixing norme issue in the example 2024-01-09 00:25:23 +01:00
kbz_8 887e2b8699 fixing issue with vulkan queues on multiple GPU computers 2024-01-08 23:50:00 +01:00
kbz_8 c64cb4ac67 fixing issue with fonts vulkan descriptor destroyed 2024-01-08 22:18:45 +01:00
kbz_8 c88d9f1d9d Better vk commands management (#31) 2024-01-07 01:49:40 +01:00
kbz_8 15b54a15c8 figin another MacOS compilation error 2024-01-07 01:45:12 +01:00
kbz_8 348dff8140 fixing compilation issues 2024-01-07 01:40:19 +01:00
kbz_8 6e4322e1ba removing gdb garbage file 2024-01-07 01:35:18 +01:00
kbz_8 a9cd7375f6 fixing better vk command buffers management 2024-01-07 01:34:02 +01:00
kbz_8 6d053a6941 update dependencies (#30)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action
2024-01-06 14:09:23 +01:00
Kbz-8 02819d281e [BOT] update dependencies 2024-01-06 01:06:21 +00:00
kbz_8 c24d961211 working on cmd resources management 2024-01-05 23:13:35 +01:00
kbz_8 b3ba952218 fixing 32bit vulkan issue 2024-01-04 12:27:31 +01:00
kbz_8 c8382eddbf yes (#29) 2024-01-03 15:49:18 +01:00
kbz_8 7c8f233cc8 Merge branch 'better_vk_commands' into indev 2024-01-03 15:47:31 +01:00
kbz_8 84ded2734d fixing gitignore file 2024-01-03 15:45:24 +01:00
kbz_8 c4cb077043 merge Indev to master (#28) 2024-01-03 15:38:38 +01:00
kbz_8 09829ed104 fixing compilation issue 2024-01-03 15:33:46 +01:00
kbz_8 988ccf32db fixing windows compilation issue 2024-01-03 15:30:35 +01:00
kbz_8 4ab70c2c35 Merge branch 'master' into indev 2024-01-03 15:17:17 +01:00
kbz_8 ae6c4710c8 improving vulkan error messages 2024-01-03 15:15:38 +01:00
kbz_8 1a19c55568 adding greetings 2024-01-03 00:30:45 +01:00
kbz_8 1ef45ebba2 fixing the workflows 2024-01-03 00:07:38 +01:00
kbz_8 0cba8d011e updating license year, fixing fetch dependencies script, adding VMA auto update, removing useless dependency in xmake build 2024-01-03 00:01:30 +01:00
kbz_8 79436b7068 Update fetch_dependencies.yml (#27) 2024-01-02 12:04:00 +01:00
kbz_8 e15aa45627 Merge branch 'master' into indev 2024-01-02 11:56:57 +01:00
kbz_8 0beb25ce92 Update fetch_dependencies.yml 2024-01-02 11:56:10 +01:00
kbz_8 86714c3dd4 merge Indev to master (#26) 2024-01-02 11:46:45 +01:00
kbz_8 3aa5c20dbc debug fetch_dependencies.yml 2024-01-02 11:28:11 +01:00
kbz_8 a1e5eb9254 adding note to README 2023-12-31 14:34:52 +01:00
kbz_8 60bacab2e4 working automated dependencies updates, polishing the CI 2023-12-31 14:17:24 +01:00
kbz_8 19a895c5f4 update dependencies (#25)
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action
2023-12-31 13:48:27 +01:00
kbz_8 bd0a111e5f debugging CI 2023-12-31 13:47:56 +01:00
Kbz-8 cbed1b7653 update dependencies 2023-12-31 12:47:00 +00:00
kbz_8 5f33613583 debugging CI 2023-12-31 13:46:45 +01:00
kbz_8 198600b853 debugging CI 2023-12-31 13:45:25 +01:00
kbz_8 32b5338187 debugging CI 2023-12-31 13:44:37 +01:00
kbz_8 d5e1e36a5d debugging CI 2023-12-31 13:41:09 +01:00
kbz_8 2bc0b94626 debugging CI 2023-12-31 13:34:11 +01:00
kbz_8 46ec35cfd7 debugging CI 2023-12-31 13:31:22 +01:00
kbz_8 9103138ee5 debugging CI 2023-12-31 13:30:32 +01:00
kbz_8 f502c86400 fixing compilation errors with local vulkan headers 2023-12-31 13:21:40 +01:00
kbz_8 d38fd8eeb1 test automated dependencies updates 2023-12-31 13:12:37 +01:00
kbz_8 16424cc2e3 Kbz 8 patch 1 (#23) 2023-12-31 11:57:44 +01:00
kbz_8 a2a1339736 Create dependabot.yml 2023-12-31 11:57:19 +01:00
kbz_8 8fa6fd35d0 merge Indev to master (#22)
yes
2023-12-31 01:41:39 +01:00
kbz_8 23333da539 Merge branch 'master' into indev 2023-12-31 01:38:11 +01:00
kbz_8 939b224b64 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH x2 2023-12-31 01:30:17 +01:00
kbz_8 e245c27867 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH 2023-12-31 01:27:37 +01:00
kbz_8 d172ea89fc I hate SDL_main on windows 2023-12-31 01:24:10 +01:00
kbz_8 075a8718de fuck SDL_main on windows 2023-12-31 01:14:17 +01:00
kbz_8 5f04c34aa0 fixing SDL issue on windows 2023-12-31 01:08:41 +01:00
kbz_8 8774d4c3fb adding transparency support to pixel put 2023-12-28 16:59:36 +01:00
kbz_8 a2f9594811 Update xmake.lua 2023-12-28 01:13:40 +01:00
kbz_8 ac3b28c922 fixing issue when creating multiple mlx application with leaks in the first one 2023-12-28 01:06:03 +01:00
kbz_8 b144afd3fe adding frame capture feature (#21) 2023-12-25 16:18:42 +01:00
kbz_8 c88ff1525d fixing frame capture 2023-12-24 16:07:09 +01:00
kbz_8 522975bf8b working on frame capture 2023-12-23 01:53:54 +01:00
kbz_8 8b9d23a17a adding possible new feature 2023-12-22 23:21:24 +01:00
kbz_8 252f9c3da0 adding CONTRIBUTIN.md 2023-12-22 01:24:55 +01:00
kbz_8 74b30ea218 fixing issue with static casts 2023-12-22 00:45:06 +01:00
kbz_8 ca13d77996 adding error messages when using a corrupted window pointer, dropping SDL init responsability when running in sandbox 2023-12-21 00:28:53 +01:00
kbz_8 5d80fd87f4 merge indev to master (#20) 2023-12-20 17:50:38 +01:00
kbz_8 9f555316fc Merge branch 'master' into indev 2023-12-20 17:38:06 +01:00
kbz_8 b384ebec1b working on better command buffers management 2023-12-20 16:35:52 +01:00
kbz_8 899ad8de70 Change github links to reflect organisation change (#19) 2023-12-20 01:03:42 +01:00
xtrm d25cfc5975 🐛 fix: change github links to reflect organisation change
Signed-off-by: xtrm <oss@xtrm.me>
2023-12-20 00:58:24 +01:00
kbz_8 66359574f9 Merge pull request #18 from 420verfl0w/errors-everywhere
Errors everywhere
2023-12-16 20:32:04 +01:00
kbz_8 6f0f944fbe removing GCC error 2023-12-16 20:20:51 +01:00
kbz_8 72cc2eb9ab adding error checks 2023-12-16 20:17:49 +01:00
kbz_8 73c8e331af new branch for error management 2023-12-16 18:51:51 +01:00
kbz_8 719dfea21c fixing compilation error 2023-12-16 02:14:23 +01:00
kbz_8 4a6a525847 updating readme 2023-12-16 02:11:54 +01:00
kbz_8 eb7330a943 Merge pull request #17 from 420verfl0w/indev
merge dev to master
2023-12-15 21:13:53 +01:00
kbz_8 2d89f41639 fixing issue when destroying an image in the loop hook, begenning single time command buffers manager 2023-12-15 21:08:46 +01:00
kbz_8 a86eab4386 updating README 2023-12-15 18:08:22 +01:00
kbz_8 e2ee1f2820 Merge pull request #16 from 420verfl0w/multiple-fonts
merge Multiple fonts in dev
2023-12-14 20:12:44 +01:00
kbz_8 280c1c076f Merge branch 'indev' into multiple-fonts 2023-12-14 19:21:12 +01:00
kbz_8 c7e59cbbeb adding multiple font support 2023-12-14 19:13:41 +01:00
kbz_8 8b2d9d15bd Merge pull request #15 from 420verfl0w/indev
removing buggy texture hash system
2023-12-14 14:44:10 +01:00
kbz_8 c2258115d7 removing buggy texture hash system 2023-12-14 14:39:00 +01:00
kbz_8 7d7ed1caba Merge pull request #14 from 420verfl0w/indev
merge dev to master
2023-12-14 13:56:28 +01:00
kbz_8 6435cc8333 fixing issues with texture rendering 2023-12-14 13:51:17 +01:00
kbz_8 a0a764d6a2 yes 2023-12-14 00:08:38 +01:00
kbz_8 74f2306e6c removed garbage file 2023-12-13 16:06:43 +01:00
kbz_8 c0e2750fb3 working on font system 2023-12-13 00:33:34 +01:00
kbz_8 5093e7d1eb Merge pull request #13 from 420verfl0w/indev
Indev
2023-12-12 18:49:48 +01:00
kbz_8 db86779907 Merge pull request #12 from 420verfl0w/macos-debug
Macos debug
2023-12-12 18:21:36 +01:00
kbz_8 a387e34d3c fixing CI 2023-12-12 18:12:41 +01:00
kbz_8 f9d729d30b fixing CI 2023-12-12 18:07:58 +01:00
kbz_8 fc3382f984 macos debug 2023-12-12 18:04:27 +01:00
kbz_8 7dda5d5624 macos debug 2023-12-12 17:58:49 +01:00
kbz_8 44d7c7e4fd macos debug 2023-12-12 17:47:10 +01:00
kbz_8 99678c2bb3 adding message when vk res init fails 2023-12-12 15:53:57 +01:00
kbz_8 bcfd5ef454 adding message when instance init fails 2023-12-12 15:46:47 +01:00
kbz_8 d2fb0e0e83 fixing run file and lib name on macos 2023-12-12 13:27:19 +01:00
kbz_8 56c11352bc removing unused files 2023-12-12 13:08:34 +01:00
kbz_8 e297b8a05a fxing macos libraries location issue 2023-12-12 13:08:00 +01:00
kbz_8 b9e0540a1b Merge pull request #11 from 420verfl0w/indev
merge dev to master
2023-12-11 23:53:56 +01:00
kbz_8 f34161fa81 Merge pull request #10 from 420verfl0w/indev
Indev
2023-12-11 20:41:15 +01:00
kbz_8 3ab024cced fixing DLL API import error 2023-12-11 20:36:21 +01:00
kbz_8 4d6c970a71 moving profile to API scope 2023-12-11 20:28:58 +01:00
kbz_8 e8f4056b81 Merge pull request #8 from 420verfl0w/vsupp-debug
Vsupp debug
2023-12-11 19:36:32 +01:00
kbz_8 5d52517d37 Merge pull request #7 from 420verfl0w/malloc-custom
improving custom malloc, removing unused code in input system
2023-12-11 19:35:38 +01:00
kbz_8 0a7a082d24 improving custom malloc, removing unused code in input system 2023-12-11 19:30:37 +01:00
kbz_8 5c497e4175 removing error 2023-12-11 13:53:40 +01:00
kbz_8 6b54089066 fixing vsupp issue, cleaning it 2023-12-11 13:40:05 +01:00
kbz_8 5f6a28f4f8 fixing warning issue with clang 2023-12-10 23:15:59 +01:00
kbz_8 49f6bb4b71 suppress warnings 2023-12-10 23:12:22 +01:00
kbz_8 1105bc6646 Merge pull request #6 from 420verfl0w/indev
merge Indev to master
2023-12-09 23:41:55 +01:00
kbz_8 36bd11fdf5 updating readmes 2023-12-09 23:33:02 +01:00
kbz_8 a5e4b41ceb updating readmes 2023-12-09 23:18:28 +01:00
kbz_8 a260be573a Merge pull request #5 from 420verfl0w/indev
merge Indev to master
2023-12-09 18:13:55 +01:00
kbz_8 327374d53b improving vsupp file 2023-12-09 18:02:30 +01:00
kbz_8 57da195bf9 improving vsupp file 2023-12-09 16:23:38 +01:00
kbz_8 d9de06a000 adding vsupp file 2023-12-09 15:46:32 +01:00
kbz_8 0a4bd42869 Merge pull request #4 from 420verfl0w/windows-support
Merge windows support into dev
2023-12-09 13:40:45 +01:00
kbz_8 fc3f72ee3e Merge branch 'windows-support' of github.com:420verfl0w/MacroLibX into windows-support 2023-12-09 13:25:30 +01:00
kbz_8 d5e263390e adding build readme for xmake, fixing windows workflow 2023-12-09 13:24:40 +01:00
kbz_8 a437316723 removing exe file 2023-12-08 23:34:19 +01:00
kbz_8 555af79e9e fixing windows dll issues 2023-12-08 23:33:26 +01:00
kbz_8 038a6db77f adding symbols to dll on windows 2023-12-08 19:13:25 +01:00
kbz_8 b078165849 adding symbols to dll on windows 2023-12-08 18:56:33 +01:00
kbz_8 591c144104 fixing cross compilation issue 2023-12-08 18:09:08 +01:00
kbz_8 0b6b0b4902 debugging windows CI 2023-12-08 16:37:42 +01:00
kbz_8 51bd482acc debugging windows CI 2023-12-08 15:57:45 +01:00
kbz_8 a68f8ede72 fixing syntax error in windows workflow 2023-12-08 14:48:28 +01:00
kbz_8 f844c3ad58 removing garbage files 2023-12-08 14:12:41 +01:00
kbz_8 b84350f76d adding xmake support and windows workflow 2023-12-08 14:11:48 +01:00
kbz_8 9d89019af3 Merge pull request #3 from 420verfl0w/indev
Merge from dev to master
2023-12-08 13:00:24 +01:00
kbz_8 ce2966e1b5 fixing issue in 42 header 2023-12-08 12:56:59 +01:00
kbz_8 5184e9500d adding mouse wheel support 2023-12-08 12:24:20 +01:00
kbz_8 bfcc8cb758 removing garbage files 2023-12-07 23:20:25 +01:00
kbz_8 854a074cac fixing memory leaks, begenning xmake support to build on windows 2023-12-07 23:19:56 +01:00
kbz_8 53c0f08bc1 fixing weird X in logo 2023-11-25 14:26:05 +01:00
kbz_8 683ef90ddb Update README.md 2023-11-25 13:13:57 +01:00
kbz_8 6c0c4c127a update logo size 2023-11-25 12:48:16 +01:00
kbz_8 e1b3f4d995 working on readme 2023-11-25 12:47:07 +01:00
kbz_8 df7aeb11bb working on readme 2023-11-25 12:31:09 +01:00
kbz_8 f634b14998 adding logo 2023-11-25 12:23:57 +01:00
kbz_8 1407e6217c update readme 2023-11-25 10:44:51 +01:00
kbz_8 f0676c950d adding screenshot te readme 2023-11-25 10:44:24 +01:00
kbz_8 05f6a810bf adding screenshot te readme 2023-11-25 10:44:00 +01:00
kbz_8 7dc5701eff adding screenshot te readme 2023-11-25 10:43:05 +01:00
kbz_8 db91730e13 transparency management added 2023-11-25 10:31:06 +01:00
kbz_8 df29e41ac5 improving font management 2023-11-24 19:34:15 +01:00
kbz_8 a158aa2269 removing gdb history 2023-11-23 14:37:58 +01:00
kbz_8 d5a8b96be8 new feature, font loading 2023-11-23 14:37:42 +01:00
kbz_8 9f869d93e2 Update README.md 2023-11-21 07:14:32 +01:00
kbz_8 20068b0ff3 Update README.md 2023-11-21 07:14:08 +01:00
kbz_8 d28b41dab5 moving to MIT license 2023-11-21 07:13:15 +01:00
kbz_8 5e63cd8959 fixing compilation error 2023-11-20 07:29:36 +01:00
kbz_8 6b970e988a fixing spaces in indentaions 2023-11-20 07:28:03 +01:00
kbz_8 8954e4e189 fixed error message for image file loading 2023-11-18 17:57:06 +01:00
kbz_8 19ccc1230e cleaning renderpass, framebuffers and swapchain code, setting all vulkan resources to NULL after destroy 2023-11-18 17:25:30 +01:00
kbz_8 519691a944 fixing GCC warning 2023-11-16 14:07:02 +01:00
kbz_8 e4df341a66 removing a trash file 2023-11-16 14:05:16 +01:00
kbz_8 d1613ddfdb removing all memory dump strings informations in release mode 2023-11-16 14:04:51 +01:00
kbz_8 e471585946 fixing memory management issue, VMA uses custom asserts 2023-11-14 12:46:51 +01:00
kbz_8 6a2a3739c7 updating readme, improving buffer transfer to GPU 2023-11-14 07:46:06 +01:00
kbz_8 6c3db4a8db fixing macos warning 2023-11-14 07:22:38 +01:00
kbz_8 02d2dbb1bd fixing rendering issues 2023-11-14 07:07:43 +01:00
kbz_8 942deade55 removing vim command in code 2023-11-11 03:32:43 +01:00
kbz_8 b75f543977 fixing physical device pick issues 2023-11-11 03:30:29 +01:00
kbz_8 ea6c2a3335 fixing GCC CI 2023-11-10 09:21:58 +01:00
kbz_8 22c9e14947 fixing compilation issues, adding profile 2023-11-10 09:19:47 +01:00
kbz_8 9c54cb6c68 working on buffers 2023-11-09 22:17:25 +01:00
kbz_8 6acd433437 deleting clangd garbage 2023-11-09 09:07:30 +01:00
kbz_8 4e5fb2648a adding debug messages to renderer, working on VMA implementation 2023-11-09 09:07:03 +01:00
kbz_8 be8caa922c Merge pull request #1 from 27network/feature/better-readme
Improve project's README.
2023-10-30 14:13:09 +01:00
kbz_8 735f748b79 Update README.md 2023-10-30 14:10:48 +01:00
xtrm 5108134a5f Change the names of the workflows to look better in the README
Signed-off-by: xtrm <oss@xtrm.me>
2023-10-30 01:28:00 +01:00
killian 9dfd3ab971 Rework README.md and add better formatting and form 2023-10-30 01:26:35 +01:00
kbz_8 0134e4e55d debugging CI 2023-10-20 03:33:31 +02:00
kbz_8 5d4ab828ed debugging CI 2023-10-19 23:48:00 +02:00
kbz_8 7f393fdcd5 debugging CI 2023-10-19 23:44:52 +02:00
kbz_8 3c0abd6fe0 debugging CI 2023-10-19 23:31:36 +02:00
kbz_8 ded90b50bf debugging CI 2023-10-19 22:58:07 +02:00
kbz_8 9677be6d9e debugging CI 2023-10-19 21:38:11 +02:00
kbz_8 a4cf2ee80f debugging CI 2023-10-19 21:37:08 +02:00
kbz_8 2951253b15 debugging CI 2023-10-19 21:23:53 +02:00
kbz_8 e8ab351963 debugging CI 2023-10-19 21:21:52 +02:00
kbz_8 1242eac872 debugging CI 2023-10-19 21:21:33 +02:00
kbz_8 6f25472e6b debugging CI 2023-10-19 21:20:18 +02:00
kbz_8 de9250dd42 debugging CI 2023-10-19 21:17:31 +02:00
kbz_8 8fee417803 debugging CI 2023-10-19 21:08:10 +02:00
kbz_8 426da22b52 debugging CI 2023-10-19 20:44:40 +02:00
kbz_8 b0968adf1c CI 2023-10-19 20:35:17 +02:00
kbz_8 7f7d197e42 adding SDL initialisation and quit, improving inputs code readability 2023-08-28 10:53:22 +02:00
kbz_8 d90ab27489 Update mlx.h 2023-08-10 08:52:46 +02:00
kbz_8 d2b8834675 Update Makefile 2023-08-10 08:46:31 +02:00
kbz_8 4e4103f86b adding image optimizations control over make call 2023-08-09 13:51:50 +02:00
kbz_8 26037936e8 adding image optimizations control over make call 2023-08-09 13:50:33 +02:00
kbz_8 bc84808333 fixing get pixel image issue 2023-08-02 12:52:38 +02:00
kbz_8 4e1832e59d fixing performance issues 2023-08-02 12:51:04 +02:00
kbz_8 a70bec4740 fixing performance issues 2023-08-02 12:50:50 +02:00
kbz_8 f6fcb214e5 yes 2023-06-06 16:35:08 +02:00
kbz_8 6a8d55dbe8 reworking texture modifiers 2023-04-25 22:14:01 +02:00
kbz_8 cb4e9dbe8d adding multiple mapping support on textures 2023-04-23 22:11:44 +02:00
kbz_8 6d3421d7f4 removing texture library 2023-04-21 22:17:55 +02:00
kbz_8 f6736f210a adding documentation to mlx.h 2023-04-19 12:36:59 +02:00
kbz_8 e7d65a297e fixing color bug 2023-04-19 11:51:13 +02:00
kbz_8 c497645ee9 working on colors issue 2023-04-14 12:29:17 +02:00
kbz_8 4fa9873f44 working input API 2023-04-12 21:53:14 +02:00
kbz_8 fe45d0953d fixing performance issue in text pipeline, working on event system 2023-04-12 15:15:25 +02:00
kbz_8 ec0f2eaa60 fixing color issues with texts 2023-04-11 23:42:27 +02:00
kbz_8 06a95fae73 working text pipeline 2023-04-11 19:21:11 +02:00
kbz_8 098622c6b9 working text pipeline 2023-04-11 13:21:11 +02:00
kbz_8 599f1007ab almost fixing text rendering 2023-04-08 20:45:06 +02:00
kbz_8 157a099ed2 working on text render pipeline 2023-04-08 04:09:25 +02:00
kbz_8 77e8672754 adding texture atlas class 2023-04-07 17:27:23 +02:00
kbz_8 10ff1acd89 adding stb_truetype 2023-04-07 13:47:22 +02:00
kbz_8 bada255057 working on text put pipeline 2023-04-06 17:26:19 +02:00
kbz_8 b03bd6fe0a removing xpm support bc frick xpm 2023-04-06 15:30:01 +02:00
kbz_8 fbe97415cf working on xpm support 2023-04-06 12:56:36 +02:00
kbz_8 27000b6163 working on xpm support 2023-04-05 01:11:49 +02:00
kbz_8 c85c12bfaf working on xpm implementation 2023-04-04 15:41:45 +02:00
kbz_8 d02f04c294 working on event system 2023-04-04 12:40:47 +02:00
kbz_8 21962dda90 adding manual image manipulation 2023-04-03 00:01:13 +02:00
kbz_8 aaf7e861d5 adding graphics support class, refactoring the code 2023-04-02 17:37:38 +02:00
kbz_8 7eea6ea1d5 adding clear window 2023-04-01 17:51:29 +02:00
kbz_8 28850a6cb8 working textures 2023-04-01 15:48:28 +02:00
kbz_8 2ab87dd3ad working pixel put pipeline 2023-04-01 13:03:21 +02:00
kbz_8 88404afb2b adding pixel put pipeline 2023-03-31 22:16:21 +02:00
kbz_8 3b29305936 yes 2023-03-08 02:25:25 +01:00
kbz_8 8ca0b041e3 adding vulkan images, start using images for put_pixel 2023-01-25 21:46:58 +01:00
kbz_8 e74d218d6e doing some stuff 2023-01-24 20:06:00 +01:00
kbz_8 b66476ef4f adding uniform buffers and projection matrix management in vertex shader 2023-01-24 17:27:55 +01:00
kbz_8 006d665ce2 adding descriptors support to renderer 2023-01-23 19:27:37 +01:00
kbz_8 c8302b4fdf rendering 2022-12-19 17:16:50 +01:00
kbz_8 2c6c3a945e almost first rendering, fixing renderer issues 2022-12-19 00:59:45 +01:00
kbz_8 c907c52968 fixing compatibility, workign on renderer 2022-12-18 04:04:10 +01:00
kbz_8 b275918de6 working on window manager 2022-10-05 20:37:04 +02:00
kbz_8 3ee3a5899b adding imputs system 2022-10-05 17:08:36 +02:00
694 changed files with 286460 additions and 198695 deletions
+1
View File
@@ -7,5 +7,6 @@ version: 2
updates:
- package-ecosystem: "github-actions" # See documentation for possible values
directory: "/" # Location of package manifests
target-branch: "indev"
schedule:
interval: "weekly"
+10 -5
View File
@@ -1,8 +1,9 @@
name: Fetch Dependencies
on:
workflow_dispatch:
schedule:
- cron: '0 0 * * *' # Runs daily
- cron: '0 0 * * 0' # Runs weekly
jobs:
update-dependencies:
@@ -10,20 +11,24 @@ jobs:
steps:
- name: Checkout Repository
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Run Fetch Dependencies Script
run: cd scripts && bash ./fetch_dependencies.sh
- name: Create Pull Request
uses: peter-evans/create-pull-request@v6
uses: peter-evans/create-pull-request@v8
with:
token: ${{ secrets.REPO_SCOPED_TOKEN }}
delete-branch: true
title: update dependencies
commit-message: "[BOT] update dependencies"
committer: GitHub <noreply@github.com>
author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
committer: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
author: kbJeff-8 <kbJeff-8@users.noreply.github.com>
signoff: false
base: indev
assignees: Kbz-8
reviewers: Kbz-8
branch: auto_deps_updates
labels: |
automated
+1 -1
View File
@@ -9,7 +9,7 @@ jobs:
issues: write
pull-requests: write
steps:
- uses: actions/first-interaction@v1
- uses: actions/first-interaction@v2
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
issue-message: |
+5 -8
View File
@@ -1,6 +1,8 @@
name: Linux (clang)
on:
repository_dispatch:
types: [create-pull-request]
pull_request:
push:
paths-ignore:
@@ -13,20 +15,15 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest]
os: [ubuntu-24.04]
arch: [x86_64]
mode: [release]
runs-on: ${{ matrix.os }}
if: "!contains(github.event.head_commit.message, 'ci skip')"
steps:
- name: Get current date as package key
id: cache_key
run: echo "key=$(date +'%W')" >> $GITHUB_OUTPUT
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Install system dependencies
run: |
@@ -35,7 +32,7 @@ jobs:
# Build the lib
- name: Build MacroLibX
run: make -j && make fclean && make -j DEBUG=true
run: make -j && make fclean && make debug
# Build the example
- name: Build Example
+5 -8
View File
@@ -1,6 +1,8 @@
name: Linux (gcc)
on:
repository_dispatch:
types: [create-pull-request]
pull_request:
push:
paths-ignore:
@@ -13,20 +15,15 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest]
os: [ubuntu-24.04]
arch: [x86_64]
mode: [release]
runs-on: ${{ matrix.os }}
if: "!contains(github.event.head_commit.message, 'ci skip')"
steps:
- name: Get current date as package key
id: cache_key
run: echo "key=$(date +'%W')" >> $GITHUB_OUTPUT
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Install system dependencies
run: |
@@ -35,7 +32,7 @@ jobs:
# Build the lib
- name: Build MacroLibX
run: make TOOLCHAIN=gcc -j && make fclean && make TOOLCHAIN=gcc DEBUG=true -j
run: make TOOLCHAIN=gcc -j && make fclean && make TOOLCHAIN=gcc debug
# Build the example
- name: Build Example
+43
View File
@@ -0,0 +1,43 @@
name: Linux (meson)
on:
repository_dispatch:
types: [create-pull-request]
pull_request:
push:
paths-ignore:
- '.gitignore'
- 'LICENSE'
- 'README.md'
jobs:
build:
strategy:
fail-fast: false
matrix:
os: [ubuntu-24.04]
arch: [x86_64]
runs-on: ${{ matrix.os }}
if: "!contains(github.event.head_commit.message, 'ci skip')"
steps:
- name: Checkout repository
uses: actions/checkout@v6
- name: Install system dependencies
run: |
sudo apt-get update
sudo apt-get -y install mesa-common-dev clang libsdl2-2.0-0 libsdl2-dev build-essential libvulkan-dev
- name: Python
uses: actions/setup-python@v6
with:
python-version: '3.11'
- name: Install Meson with pip
run: sudo pip3 install meson
- name: Build with meson
run: |
meson build --prefix=$PWD/ --bindir='' --libdir=''
ninja install -C build
@@ -1,6 +1,8 @@
name: macOS
on:
repository_dispatch:
types: [create-pull-request]
pull_request:
push:
paths-ignore:
@@ -14,34 +16,23 @@ jobs:
fail-fast: false
matrix:
os: [macOS-latest]
arch: [x86_64]
mode: [release]
arch: [x86_64, arm]
runs-on: ${{ matrix.os }}
if: "!contains(github.event.head_commit.message, 'ci skip')"
steps:
- name: Get current date as package key
id: cache_key
run: echo "key=$(date +'%W')" >> $GITHUB_OUTPUT
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v6
# Install system dependencies
- name: Install Vulkan SDK
uses: humbletim/install-vulkan-sdk@v1.1.1
with:
version: 1.3.204.1
cache: true
- name: Install Dependancies
run: |
brew install SDL2
# Build the lib
- name: Build MacroLibX
run: make -j && make fclean && make DEBUG=true -j
run: make -j && make fclean && make debug
# Build the example
- name: Build Example
+42
View File
@@ -0,0 +1,42 @@
name: macOS (meson)
on:
repository_dispatch:
types: [create-pull-request]
pull_request:
push:
paths-ignore:
- '.gitignore'
- 'LICENSE'
- 'README.md'
jobs:
build:
strategy:
fail-fast: false
matrix:
os: [macOS-latest]
arch: [x86_64, arm]
runs-on: ${{ matrix.os }}
if: "!contains(github.event.head_commit.message, 'ci skip')"
steps:
- name: Checkout repository
uses: actions/checkout@v6
- name: Install system dependencies
run: |
brew install SDL2
- name: Python
uses: actions/setup-python@v6
with:
python-version: '3.11'
- name: Install Meson with pip
run: sudo pip3 install meson
- name: Build with meson
run: |
meson build --prefix=$PWD/ --bindir='' --libdir=''
ninja install -C build
+80
View File
@@ -0,0 +1,80 @@
name: Unit tests
on:
repository_dispatch:
types: [create-pull-request]
pull_request:
push:
paths-ignore:
- '.gitignore'
- 'LICENSE'
- 'README.md'
jobs:
build:
strategy:
fail-fast: false
matrix:
os: [ubuntu-24.04]
arch: [x86_64]
runs-on: ${{ matrix.os }}
if: "!contains(github.event.head_commit.message, 'ci skip')"
steps:
- name: Checkout repository
uses: actions/checkout@v6
- uses: NcStudios/VulkanCI@v1.2
- name: Install system dependencies
run: |
sudo apt-get update
sudo apt-get -y install mesa-common-dev clang libsdl2-2.0-0 libsdl2-dev build-essential libvulkan-dev
# Build the lib
- name: Build MacroLibX
run: make -j DEBUG=true
# Force xmake to a specific folder (for cache)
- name: Set xmake env
run: echo "XMAKE_GLOBALDIR=${{ runner.workspace }}/xmake-global" >> $GITHUB_ENV
# Install xmake
- name: Setup xmake
if: ${{ matrix.confs.plat != 'mingw' }}
uses: xmake-io/github-action-setup-xmake@v1
with:
xmake-version: latest
actions-cache-folder: .xmake-cache-W${{ steps.cache_key.outputs.key }}
# Update xmake repository (in order to have the file that will be cached)
- name: Update xmake repository
run: xmake repo --update
# Fetch xmake dephash
- name: Retrieve dependencies hash
id: dep_hash
run: echo "hash=$(xmake l utils.ci.packageskey)" >> $GITHUB_OUTPUT
- name: Install unit tester
run: git clone https://github.com/seekrs/MacroUnitTest.git ../MacroUnitTest
# Setup compilation mode and install project dependencies
- name: Configure xmake and install dependencies
run: |
cd ../MacroUnitTest
xmake config --toolchain=clang --ccache=n --yes
# Save dependencies
- name: Save cached xmake dependencies
if: ${{ !steps.restore-depcache.outputs.cache-hit }}
uses: actions/cache/save@v5
with:
path: ${{ env.XMAKE_GLOBALDIR }}/.xmake/packages
key: ${{ steps.restore-depcache.outputs.cache-primary-key }}
- name: Build and run unit tester
run: |
cd ../MacroUnitTest
xmake run MacroUnitTest --headless --path="${{ runner.workspace }}/MacroLibX/libmlx.so"
+4 -13
View File
@@ -1,6 +1,8 @@
name: Windows (xmake)
on:
repository_dispatch:
types: [create-pull-request]
pull_request:
push:
paths-ignore:
@@ -14,7 +16,7 @@ jobs:
fail-fast: false
matrix:
os: [windows-latest]
arch: [x64]
arch: [x64, x86]
mode: [release]
runs-on: ${{ matrix.os }}
@@ -26,14 +28,7 @@ jobs:
run: echo "key=$(date +'%W')" >> $GITHUB_OUTPUT
- name: Checkout repository
uses: actions/checkout@v4
# Install system dependencies
- name: Install Vulkan SDK
uses: humbletim/install-vulkan-sdk@v1.1.1
with:
version: 1.3.204.1
cache: true
uses: actions/checkout@v6
# Force xmake to a specific folder (for cache)
- name: Set xmake env
@@ -57,7 +52,3 @@ jobs:
# Build the mlx
- name: Build MacroLibX
run: xmake --yes
# Build the example
- name: Build Example
run: xmake build --yes Test
+109
View File
@@ -0,0 +1,109 @@
name : Windows (Meson)
on:
repository_dispatch:
types: [create-pull-request]
pull_request:
push:
paths-ignore:
- '.gitignore'
- 'LICENSE'
- 'README.md'
jobs:
VisualStudio:
if: "!contains(github.event.head_commit.message, 'ci skip')"
runs-on: windows-latest
strategy:
fail-fast: false
matrix:
platform: ['x64', 'x86']
steps:
- uses: actions/checkout@v6
with:
fetch-depth: 0
# Install a 32-bit Python so building related stuff work.
- name: Setup x86 Python
if: matrix.platform == 'x86'
uses: actions/setup-python@v6
with:
architecture: 'x86'
python-version: '3.12'
- name: Install Meson & Ninja
run: |
python -m pip install meson ninja
- uses: ilammy/msvc-dev-cmd@v1
with:
arch: ${{matrix.platform}}
- name: Compile mlx
run: |
meson setup builddir
meson compile -C builddir
VisualStudio-clang-cl:
if: "!contains(github.event.head_commit.message, 'ci skip')"
runs-on: windows-latest
strategy:
fail-fast: false
env:
CC: clang-cl
CXX: clang-cl
steps:
- uses: actions/checkout@v6
with:
fetch-depth: 0
- name: Install Meson & Ninja
run: |
python -m pip install meson ninja
- uses: ilammy/msvc-dev-cmd@v1
- name: Compile mlx
run: |
meson setup builddir
meson compile -C builddir
MSYS2:
if: "!contains(github.event.head_commit.message, 'ci skip')"
runs-on: windows-latest
strategy:
fail-fast: false
matrix:
platform: ['UCRT64', 'CLANG64']
steps:
- uses: actions/checkout@v6
with:
fetch-depth: 0
- uses: msys2/setup-msys2@v2
with:
msystem: ${{matrix.platform}}
install: >-
bison
dos2unix
flex
git
pacboy: >-
cc:p
cmake:p
ninja:p
pkgconf:p
python-certifi:p
python-pip:p
# Make sure Python is updated to >=3.11 (fix https://github.com/msys2/MINGW-packages/issues/17415).
update: true
- name: Install Meson
shell: msys2 {0}
run: |
python -m pip install meson
- name: Compile mlx
shell: msys2 {0}
run: |
meson setup builddir
meson compile -C builddir
+6 -1
View File
@@ -11,8 +11,11 @@
*.tmp
*.ilk
*.pdb
*.gch
*.pch
*.sym
*.exe
*vgcore
*vgcore.*
*.gdb_history
.vs/
.xmake/
@@ -20,3 +23,5 @@
objs/
build/
example/Test
subprojects/*/
subprojects/.wraplock
+1 -1
View File
@@ -1,5 +1,5 @@
MIT License
Copyright (c) 2022-2024 kbz_8
Copyright (c) 2022-2026 kbz_8
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
+134 -61
View File
@@ -1,101 +1,174 @@
# **************************************************************************** #
# #
# ::: :::::::: #
# Makefile :+: :+: :+: #
# +:+ +:+ +:+ #
# By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2022/10/04 16:43:41 by maldavid #+# #+# #
# Updated: 2024/01/10 14:20:30 by maldavid ### ########.fr #
# #
# **************************************************************************** #
NAME = libmlx.so
MAKE = make --no-print-directory
NAME = libmlx.so
SRCS = $(wildcard $(addsuffix /*.cpp, ./src/core))
SRCS += $(wildcard $(addsuffix /*.cpp, ./src/platform))
SRCS += $(wildcard $(addsuffix /*.cpp, ./src/renderer))
SRCS += $(wildcard $(addsuffix /*.cpp, ./src/renderer/**))
OBJ_DIR = objs/makefile
OBJS = $(addprefix $(OBJ_DIR)/, $(SRCS:.cpp=.o))
OS = $(shell uname -s)
DEBUG ?= false
TOOLCHAIN ?= clang
IMAGES_OPTIMIZED ?= true
FORCE_INTEGRATED_GPU ?= false
OS ?= $(shell uname -s)
DEBUG ?= false
TOOLCHAIN ?= clang
GRAPHICS_MEMORY_DUMP ?= false
PROFILER ?= false
FORCE_WAYLAND ?= false
DISABLE_ALL_SAFETIES ?= false
_ENABLEDFLAGS =
MODE = "release"
SRCS = $(wildcard $(addsuffix /*.cpp, runtime/Sources/Core))
SRCS += $(wildcard $(addsuffix /*.cpp, runtime/Sources/Graphics))
SRCS += $(wildcard $(addsuffix /*.cpp, runtime/Sources/Platform))
SRCS += $(wildcard $(addsuffix /*.cpp, runtime/Sources/Renderer))
SRCS += $(wildcard $(addsuffix /*.cpp, runtime/Sources/Renderer/Vulkan))
SRCS += $(wildcard $(addsuffix /*.cpp, runtime/Sources/Renderer/Pipelines))
SRCS += $(wildcard $(addsuffix /*.cpp, runtime/Sources/Renderer/RenderPasses))
CXX = clang++
OBJ_DIR = objs/make/$(shell echo $(OS) | tr '[:upper:]' '[:lower:]')
OBJS := $(addprefix $(OBJ_DIR)/, $(SRCS:.cpp=.o))
CXXFLAGS = -std=c++17 -O3 -fPIC -Wall -Wextra -Werror -DSDL_MAIN_HANDLED
INCLUDES = -I./includes -I./src -I./third_party
SHADERS_DIR = runtime/Includes/Embedded
SHADERS_SRCS = $(wildcard $(addsuffix /*.nzsl, $(SHADERS_DIR)))
SPVS = $(SHADERS_SRCS:.nzsl=.spv.h)
LDLIBS =
CXX = clang++
CXXFLAGS = -std=c++20 -fPIC -Wall -Wextra -DSDL_MAIN_HANDLED
INCLUDES = -I./includes -I./runtime/Includes -I./runtime/Sources -I./third_party
CXXPCHFLAGS = -xc++-header -std=c++20 -Wall -Wextra
PCH_SOURCE = runtime/Includes/PreCompiled.h
GCH = runtime/Includes/PreCompiled.h.gch
CCH = runtime/Includes/PreCompiled.h.pch
PCH =
# Personal path, should be overriden with env var
UNIT_TESTS_PATH = ../UnitTester/build/Bin/linux_x86_64/MacroUnitTest
NZSLC ?= nzslc
ifeq ($(TOOLCHAIN), gcc)
CXX = g++
PCH = $(GCH)
CXXFLAGS += -Wno-error=cpp
else
CXXFLAGS += -Wno-error=#warning
PCH = $(CCH)
CXXFLAGS += -Wno-error=#warning -include-pch $(PCH)
endif
ifeq ($(OS), Darwin)
LDLIBS += -L /opt/homebrew/lib -lSDL2
CXXFLAGS += -I /opt/homebrew/include
LDFLAGS += -L /opt/homebrew/Cellar/lib -L /usr/local/Cellar -L /opt/homebrew/lib -lSDL2
INCLUDES += -I /opt/homebrew/Cellar/include -I /usr/local/Cellar/include -I /opt/homebrew/include
NAME = libmlx.dylib
endif
ifeq ($(DEBUG), true)
CXXFLAGS += -g -D DEBUG
MODE = "debug"
endif
ifeq ($(FORCE_INTEGRATED_GPU), true)
CXXFLAGS += -D FORCE_INTEGRATED_GPU
endif
ifeq ($(IMAGES_OPTIMIZED), true)
CXXFLAGS += -D IMAGE_OPTIMIZED
CXXFLAGS += -g3 -O0 -D DEBUG
LDFLAGS += -rdynamic
else
CXXFLAGS += -O3
endif
ifeq ($(GRAPHICS_MEMORY_DUMP), true)
CXXFLAGS += -D GRAPHICS_MEMORY_DUMP
_ENABLEDFLAGS += GRAPHICS_MEMORY_DUMP
endif
ifeq ($(PROFILER), true)
CXXFLAGS += -D PROFILER
_ENABLEDFLAGS += PROFILER
endif
ifeq ($(FORCE_WAYLAND), true)
_ENABLEDFLAGS += FORCE_WAYLAND
endif
ifeq ($(DISABLE_ALL_SAFETIES), true)
_ENABLEDFLAGS += DISABLE_ALL_SAFETIES
endif
CXXFLAGS += $(addprefix -D, $(_ENABLEDFLAGS))
RM = rm -rf
$(OBJ_DIR)/%.o: %.cpp
@printf "\033[1;32m[compiling... "$(MODE)" "$(CXX)"]\033[1;00m "$<"\n"
TPUT = tput -T xterm-256color
_RESET := $(shell $(TPUT) sgr0)
_BOLD := $(shell $(TPUT) bold)
_ITALIC := $(shell $(TPUT) sitm)
_UNDER := $(shell $(TPUT) smul)
_GREEN := $(shell $(TPUT) setaf 2)
_YELLOW := $(shell $(TPUT) setaf 3)
_RED := $(shell $(TPUT) setaf 1)
_GRAY := $(shell $(TPUT) setaf 8)
_PURPLE := $(shell $(TPUT) setaf 5)
ifeq ($(DEBUG), true)
MODE := $(_RESET)$(_PURPLE)$(_BOLD)Debug$(_RESET)$(_PURPLE)
COLOR := $(_PURPLE)
else
MODE := $(_RESET)$(_GREEN)$(_BOLD)Release$(_RESET)$(_GREEN)
COLOR := $(_GREEN)
endif
OBJS_TOTAL = $(words $(OBJS))
N_OBJS := $(shell find $(OBJ_DIR) -type f -name '*.o' 2>/dev/null | wc -l)
OBJS_TOTAL := $(shell echo $$(( $(OBJS_TOTAL) - $(N_OBJS) )))
ifeq ($(OBJS_TOTAL), 0) # To avoid division per 0
OBJS_TOTAL := 1
endif
CURR_OBJ = 0
$(OBJ_DIR)/%.o: %.cpp $(PCH)
@mkdir -p $(dir $@)
@$(eval CURR_OBJ=$(shell echo $$(( $(CURR_OBJ) + 1 ))))
@$(eval PERCENT=$(shell echo $$(( $(CURR_OBJ) * 100 / $(OBJS_TOTAL) ))))
@printf "$(COLOR)($(_BOLD)%3s%%$(_RESET)$(COLOR)) $(_RESET)Compiling $(_BOLD)$<$(_RESET)\n" "$(PERCENT)"
@$(CXX) $(CXXFLAGS) $(INCLUDES) -c $< -o $@
all: $(NAME)
SPVS_TOTAL = $(words $(SPVS))
N_SPVS := $(shell find $(SHADERS_DIR) -type f -name '*.spv.h' 2>/dev/null | wc -l)
SPVS_TOTAL := $(shell echo $$(( $(SPVS_TOTAL) - $(N_SPVS) )))
ifeq ($(SPVS_TOTAL), 0) # Same
SPVS_TOTAL := 1
endif
CURR_SPV = 0
$(NAME): $(OBJ_DIR) $(OBJS)
@printf "\033[1;32m[linking ... "$(MODE)"]\033[1;00m "$@"\n"
@$(CXX) -shared -o $(NAME) $(OBJS) $(LDLIBS)
@printf "\033[1;32m[build finished]\033[1;00m\n"
%.spv.h: %.nzsl
@$(eval CURR_SPV=$(shell echo $$(( $(CURR_SPV) + 1 ))))
@$(eval PERCENT=$(shell echo $$(( $(CURR_SPV) * 100 / $(SPVS_TOTAL) ))))
@printf "$(COLOR)($(_BOLD)%3s%%$(_RESET)$(COLOR)) $(_RESET)Compiling $(_BOLD)$<$(_RESET)\n" "$(PERCENT)"
@$(NZSLC) --compile=spv-header $< -o $(SHADERS_DIR) --optimize
$(OBJ_DIR):
@mkdir -p $(sort $(addprefix $(OBJ_DIR)/, $(dir $(SRCS))))
@printf "\033[1;32m[created objs directory]\033[1;00m\n"
all: _printbuildinfos
@$(MAKE) $(NAME)
$(PCH):
@printf "$(COLOR)($(_BOLD)%3s%%$(_RESET)$(COLOR)) $(_RESET)Compiling $(_BOLD)PreCompiled header$(_RESET)\n" "0"
@$(CXX) $(CXXPCHFLAGS) $(INCLUDES) $(PCH_SOURCE) -o $(PCH)
$(NAME): $(OBJS)
@printf "Linking $(_BOLD)$(NAME)$(_RESET)\n"
@$(CXX) -shared -o $(NAME) $(OBJS) $(LDFLAGS)
@printf "$(_BOLD)$(NAME)$(_RESET) compiled $(COLOR)$(_BOLD)successfully$(_RESET)\n"
_printbuildinfos:
@printf "$(_PURPLE)$(_BOLD)MacroLibX $(_RESET)Compiling in $(_BOLD)$(MODE)$(_RESET) mode on $(_BOLD)$(OS)$(_RESET) | Using $(_BOLD)$(CXX) ($(shell $(CXX) --version | head -n 1))$(_RESET), flags: $(_BOLD)$(_ENABLEDFLAGS)$(_RESET)\n"
debug:
@$(MAKE) all DEBUG=true -j$(shell nproc)
clean-shaders:
@$(RM) $(SPVS)
shaders: clean-shaders $(SPVS)
tests: debug
@$(UNIT_TESTS_PATH) --headless --path="./$(NAME)"
clean:
@$(RM) $(OBJ_DIR)
@printf "\033[1;32m[object files removed]\033[1;00m\n"
@printf "Cleaned $(_BOLD)$(OBJ_DIR)$(_RESET)\n"
@$(RM) $(GCH)
@$(RM) $(CCH)
@printf "Cleaned pre compiled header\n"
fclean: clean
fclean: clean
@$(RM) $(NAME)
@printf "\033[1;32m["$(NAME)" removed]\033[1;00m\n"
@printf "Cleaned $(_BOLD)$(NAME)$(_RESET)\n"
re: fclean all
re: fclean _printbuildinfos
@$(MAKE) $(NAME)
.PHONY: all clean fclean re
.PHONY: all clean debug shaders clean-shaders fclean re
+8 -11
View File
@@ -3,15 +3,18 @@
<div align="center">
<a href="https://github.com/seekrs/MacroLibX/actions/workflows/linux_clang.yml"><img src="https://github.com/seekrs/MacroLibX/actions/workflows/linux_clang.yml/badge.svg"></a>
<a href="https://github.com/seekrs/MacroLibX/actions/workflows/linux_gcc.yml"><img src="https://github.com/seekrs/MacroLibX/actions/workflows/linux_gcc.yml/badge.svg"></a>
<a href="https://github.com/seekrs/MacroLibX/actions/workflows/macos_x86.yml"><img src="https://github.com/seekrs/MacroLibX/actions/workflows/macos_x86.yml/badge.svg"></a>
<a href="https://github.com/seekrs/MacroLibX/actions/workflows/macos.yml"><img src="https://github.com/seekrs/MacroLibX/actions/workflows/macos.yml/badge.svg"></a>
</div>
<div align="center">
<a href="https://github.com/seekrs/MacroLibX/actions/workflows/windows.yml"><img src="https://github.com/seekrs/MacroLibX/actions/workflows/windows.yml/badge.svg"></a>
</div>
<div align="center">
<a href="https://github.com/seekrs/MacroLibX/actions/workflows/tests.yml"><img src="https://github.com/seekrs/MacroLibX/actions/workflows/tests.yml/badge.svg"></a>
</div>
</div>
###### MacroLibX, a rewrite of 42 School's MiniLibX using SDL2 and Vulkan.
The goal of this version is to provide a light, fast, and modern graphical tool while keeping the same API.
The goal of this version is to provide a light, fast, and modern graphical tool.
## 🌟 Features
@@ -21,9 +24,6 @@ Built on top of Vulkan, the MacroLibX takes advantage of its very low-level natu
### 💻 Cross-Platform
Designed to be totally cross-platform, it can run on any SDL2-supported platform that supports Vulkan (even the Nintendo Switch ! theoretically... ).
### 🗿 Close to the old minilibx
One of the guidelines of this lib was to get as close as possible to the old minilibx API, and therefore to the educational choices of the old minilibx.
### 📖 It's all FOSS
Everything in this repo is entirely free and open source, all available under the MIT license (even the third-party libraries used).
@@ -97,15 +97,12 @@ And you can enjoy your project
### 📦 Compile mode
By default the mlx is built in release mode but you can switch to debug by using `make DEBUG=true`.
### 🦺 Safety
MacroLibX has a strong safety support, mainly by checking every pointer that you pass to it. But this safety has a cost that can be avoided by enabling `DISABLE_ALL_SAFETIES=true` before compiling but don't be afraid to recieve segmentation faults from the mlx.
### 🛠️ Set the toolchain
If you want to use `GCC` to build the mlx you can use `make TOOLCHAIN=gcc`
### ⚠️⚠️⚠️ 🖼️ Image optimisations ⚠️⚠️⚠️
If you run into glitches when writing or reading pixels from images you can turn off images optimisations by using `make IMAGES_OPTIMIZED=false`.
### 🖥️ Force the integrated GPU (not recommended)
You can force the mlx to use your integrated GPU by using `make FORCE_INTEGRATED_GPU=true`. Note that there are a lot of chances that your application crashes by using that.
### 💽 Dump the graphics memory
The mlx can dump it's graphics memory use to json files every two seconds by enabling this option `make GRAPHICS_MEMORY_DUMP=true`.
+4 -7
View File
@@ -10,20 +10,17 @@ Just as the Makfile build system, you can configure how xmake should build the M
### 📦 Compile mode
You can configure xmake to build the mlx in debug mode or in release mode (release mode is enabled by default). To do so you can use `xmake config --mode=debug` or `xmake config --mode=release`.
### 🦺 Safety
MacroLibX has a strong safety support, mainly by checking every pointer that you pass to it. But this safety has a cost that can be avoided by enabling `xmake config --disable_all_safeties=y` before compiling but don't be afraid to recieve segmentation faults from the mlx.
### 🛠️ Set the toolchain
To change the compilation toolchain you can use `xmake config --toolchain=[gcc|clang|...]`
### ⚠️⚠️⚠️ 🖼️ Image optimisations ⚠️⚠️⚠️
If you run into glitches when writing or reading pixels from images you can turn off images optimisations by using `xmake config --images_optimized=n`.
### 🖥️ Force the integrated GPU (not recommended)
You can force the mlx to use your integrated GPU using `xmake config --force_integrated_gpu=y`. Note that there are a lot of chances that your application crashes by using that.
### 💽 Dump the graphics memory
The mlx can dump it's graphics memory use to json files every two seconds by enabling this option `xmake config --graphics_memory_dump=y`.
### 🪛 A possible build configuration
As a configuration example here's how the command can look like `xmake config --mode=debug --toolchain=clang --graphics_memory_dump=y --images_optimized=n`
As a configuration example here's how the command can look like `xmake config --mode=debug --toolchain=clang --graphics_memory_dump=y`
## 🚧 Build the lib
File diff suppressed because it is too large Load Diff
+11
View File
@@ -0,0 +1,11 @@
-xc++
-std=c++20
-Iruntime/Includes
-Iruntime/Sources
-Iincludes
-Ithird_party
-DMLX_BUILD
-DSDL_MAIN_HANDLED
-DDEBUG
-D_REENTRANT
-isystem/usr/include/SDL2
+2 -3
View File
@@ -5,8 +5,7 @@ if [ -e a.out ]; then
fi
if [ $(uname -s) = 'Darwin' ]; then
clang main.c ../libmlx.dylib -L /opt/homebrew/lib -lSDL2 -g;
clang main.c ../libmlx.dylib -L /opt/homebrew/lib -lSDL2 -lm -g;
else
clang main.c ../libmlx.so -lSDL2 -g -Wall -Wextra -Werror;
clang main.c ../libmlx.so -lSDL2 -lm -g -Wall -Wextra -Werror;
fi
+93 -63
View File
@@ -1,66 +1,77 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* main.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2022/10/04 17:55:21 by maldavid #+# #+# */
/* Updated: 2024/02/24 01:07:56 by maldavid ### ########.fr */
/* */
/* ************************************************************************** */
#include <stdio.h>
#include <math.h>
#include "../includes/mlx.h"
#include "../includes/mlx_extended.h"
typedef struct
{
void* mlx;
void* win;
void* logo_png;
void* logo_jpg;
void* logo_bmp;
void* img;
mlx_context mlx;
mlx_window win;
mlx_image logo_png;
mlx_image logo_jpg;
mlx_image logo_bmp;
mlx_image img;
} mlx_t;
int update(void* param)
#define CIRCLE_RADIUS 50
#define CIRCLE_DIAMETER (CIRCLE_RADIUS + CIRCLE_RADIUS)
static mlx_color pixels_circle[CIRCLE_DIAMETER * CIRCLE_DIAMETER] = { 0 };
#define THRESHOLD 200
void update(void* param)
{
static int i = 0;
mlx_t* mlx = (mlx_t*)param;
if(i == 200)
mlx_clear_window(mlx->mlx, mlx->win);
if(i > THRESHOLD)
{
mlx_clear_window(mlx->mlx, mlx->win, (mlx_color){ .rgba = 0x334D4DFF });
mlx_put_transformed_image_to_window(mlx->mlx, mlx->win, mlx->logo_bmp, 220, 40, 0.5f, 0.5f, i);
}
if(i >= 250)
mlx_set_font_scale(mlx->mlx, mlx->win, "default", 16.f);
if(i >= THRESHOLD + THRESHOLD / 4)
mlx_set_font_scale(mlx->mlx, "default", 16.f);
else
mlx_set_font_scale(mlx->mlx, mlx->win, "default", 6.f);
mlx_string_put(mlx->mlx, mlx->win, 160, 120, 0xFFFF2066, "this text should be hidden");
mlx_set_font_scale(mlx->mlx, "default", 6.f);
mlx_string_put(mlx->mlx, mlx->win, 160, 120, (mlx_color){ .rgba = 0xFF2066FF }, "this text should be behind");
mlx_put_image_to_window(mlx->mlx, mlx->win, mlx->logo_png, 100, 100);
mlx_put_image_to_window(mlx->mlx, mlx->win, mlx->logo_jpg, 210, 150);
mlx_put_image_to_window(mlx->mlx, mlx->win, mlx->logo_bmp, 220, 40);
mlx_put_image_to_window(mlx->mlx, mlx->win, mlx->img, 150, 60);
mlx_set_font(mlx->mlx, mlx->win, "default");
mlx_string_put(mlx->mlx, mlx->win, 20, 50, 0xFFFFFFFF, "that's a text");
mlx_set_font(mlx->mlx, "default");
mlx_string_put(mlx->mlx, mlx->win, 20, 50, (mlx_color){ .rgba = 0xFFFFFFFF }, "that's a text");
int color = 0;
for(int j = 0; j < 400; j++)
int win_width;
int win_height;
mlx_get_window_size(mlx->mlx, mlx->win, &win_width, &win_height);
uint32_t color = 0;
for(int j = 0; j < win_height; j++)
{
mlx_pixel_put(mlx->mlx, mlx->win, j, j, 0xFFFF0000 + color);
mlx_pixel_put(mlx->mlx, mlx->win, 399 - j, j, 0xFF0000FF);
mlx_pixel_put(mlx->mlx, mlx->win, j, j, (mlx_color){ .rgba = 0x0000FFFF + (color << 24) });
mlx_pixel_put(mlx->mlx, mlx->win, win_width - j, j, (mlx_color){ .rgba = 0x0000FFFF });
color += (color < 255);
}
i++;
return 0;
if(i < THRESHOLD)
mlx_put_transformed_image_to_window(mlx->mlx, mlx->win, mlx->logo_jpg, 210, 150, 0.5f, 2.0f, 0.0f);
else
mlx_put_transformed_image_to_window(mlx->mlx, mlx->win, mlx->logo_jpg, 210, 150, fabs(sin(i / 100.0f)), fabs(cos(i / 100.0f) * 2.0f), 0.0f);
mlx_set_font_scale(mlx->mlx, "default", 8.f);
mlx_string_put(mlx->mlx, mlx->win, 210, 175, (mlx_color){ .rgba = 0xFFAF2BFF }, "hidden");
mlx_pixel_put_region(mlx->mlx, mlx->win, 200, 170, CIRCLE_DIAMETER, CIRCLE_DIAMETER, pixels_circle);
i++; // Will overflow and I don't care
}
void* create_image(mlx_t* mlx)
mlx_image create_image(mlx_t* mlx)
{
unsigned char pixel[4];
void* img = mlx_new_image(mlx->mlx, 100, 100);
mlx_image img = mlx_new_image(mlx->mlx, 100, 100);
for(int i = 0, j = 0, k = 0; i < (100 * 100) * 4; i += 4, j++)
{
if(j >= 100)
@@ -70,17 +81,19 @@ void* create_image(mlx_t* mlx)
}
if(i < 10000 || i > 20000)
{
pixel[0] = i;
pixel[1] = j;
pixel[2] = k;
pixel[3] = 0x99;
mlx_set_image_pixel(mlx->mlx, img, j, k, *((int *)pixel));
mlx_color pixel = {
.r = (uint8_t)k,
.g = (uint8_t)j,
.b = (uint8_t)i,
.a = 0x99
};
mlx_set_image_pixel(mlx->mlx, img, j, k, pixel);
}
}
return img;
}
int key_hook(int key, void* param)
void key_hook(int key, void* param)
{
int x;
int y;
@@ -93,13 +106,13 @@ int key_hook(int key, void* param)
mlx_loop_end(mlx->mlx);
break;
case 22 : // (S)how
mlx_mouse_show();
mlx_mouse_show(mlx->mlx);
break;
case 11 : // (H)ide
mlx_mouse_hide();
mlx_mouse_hide(mlx->mlx);
break;
case 6 : // (C)lear
mlx_clear_window(mlx->mlx, mlx->win);
mlx_clear_window(mlx->mlx, mlx->win, (mlx_color){ .rgba = 0x334D4DFF });
break;
case 79 : // RIGHT KEY
mlx_mouse_move(mlx->mlx, mlx->win, x + 10, y);
@@ -116,16 +129,16 @@ int key_hook(int key, void* param)
default : break;
}
return 0;
}
int window_hook(int event, void* param)
void window_hook(int event, void* param)
{
if(event == 0)
mlx_loop_end(((mlx_t*)param)->mlx);
return 0;
}
#include <stdlib.h>
int main(void)
{
mlx_t mlx;
@@ -133,38 +146,55 @@ int main(void)
int h;
int dummy;
int i = 0;
for(int j = 0; j < CIRCLE_DIAMETER; j++)
{
for(int k = 0; k < CIRCLE_DIAMETER; k++, i++)
{
if((CIRCLE_RADIUS - j) * (CIRCLE_RADIUS - j) + (CIRCLE_RADIUS - k) * (CIRCLE_RADIUS - k) < CIRCLE_RADIUS * CIRCLE_RADIUS)
pixels_circle[i] = (mlx_color){ .rgba = 0xA10000FF + ((j * k * i) << 8) };
}
}
mlx.mlx = mlx_init();
mlx.win = mlx_new_window(mlx.mlx, 400, 400, "My window");
mlx_window_create_info info = { 0 };
info.title = "My window";
info.width = 400;
info.height = 400;
info.is_resizable = true;
mlx.win = mlx_new_window(mlx.mlx, &info);
mlx_get_screen_size(mlx.mlx, mlx.win, &w, &h);
printf("screen size : %dx%d\n", w, h);
mlx_set_fps_goal(mlx.mlx, 60);
mlx_on_event(mlx.mlx, mlx.win, MLX_KEYDOWN, key_hook, &mlx);
mlx_on_event(mlx.mlx, mlx.win, MLX_WINDOW_EVENT, window_hook, &mlx);
mlx.logo_png = mlx_png_file_to_image(mlx.mlx, "42_logo.png", &dummy, &dummy);
mlx.logo_bmp = mlx_bmp_file_to_image(mlx.mlx, "42_logo.bmp", &dummy, &dummy);
mlx.logo_jpg = mlx_jpg_file_to_image(mlx.mlx, "42_logo.jpg", &dummy, &dummy);
mlx.logo_bmp = mlx_new_image_from_file(mlx.mlx, "42_logo.bmp", &dummy, &dummy);
mlx.logo_png = mlx_new_image_from_file(mlx.mlx, "42_logo.png", &dummy, &dummy);
mlx.logo_jpg = mlx_new_image_from_file(mlx.mlx, "42_logo.jpg", &dummy, &dummy);
mlx_pixel_put(mlx.mlx, mlx.win, 200, 10, 0xFFFF00FF);
mlx_put_image_to_window(mlx.mlx, mlx.win, mlx.logo_png, 10, 190);
mlx_pixel_put(mlx.mlx, mlx.win, 200, 10, (mlx_color){ .rgba = 0xFF00FFFF });
mlx_put_image_to_window(mlx.mlx, mlx.win, mlx.logo_png, 0, 0);
mlx.img = create_image(&mlx);
mlx_set_font_scale(mlx.mlx, mlx.win, "font.ttf", 16.f);
mlx_string_put(mlx.mlx, mlx.win, 20, 20, 0xFF0020FF, "that text will disappear");
mlx_set_font_scale(mlx.mlx, "font.ttf", 16.f);
mlx_string_put(mlx.mlx, mlx.win, 20, 20, (mlx_color){ .rgba = 0x0020FFFF }, "that text will disappear");
mlx_loop_hook(mlx.mlx, update, &mlx);
mlx_add_loop_hook(mlx.mlx, update, &mlx);
mlx_loop(mlx.mlx);
mlx_get_screens_size(mlx.mlx, mlx.win, &w, &h);
printf("screen size : %dx%d\n", w, h);
mlx_destroy_image(mlx.mlx, mlx.logo_png);
mlx_destroy_image(mlx.mlx, mlx.logo_jpg);
mlx_destroy_image(mlx.mlx, mlx.logo_bmp);
mlx_destroy_image(mlx.mlx, mlx.img);
mlx_destroy_window(mlx.mlx, mlx.win);
mlx_destroy_display(mlx.mlx);
mlx_destroy_context(mlx.mlx);
return 0;
}
+11
View File
@@ -0,0 +1,11 @@
#!/bin/bash
if [ -e a.out ]; then
rm a.out
fi
if [ $(uname -s) = 'Darwin' ]; then
clang main.c ../../libmlx.dylib -L /opt/homebrew/lib -lSDL2 -lm -g;
else
clang main.c ../../libmlx.so -lSDL2 -g -Wall -Wextra -Werror -lm;
fi
+28
View File
@@ -0,0 +1,28 @@
#include <stdio.h>
#include <stddef.h>
#include "../../includes/mlx.h"
#include "../../includes/mlx_extended.h"
#include <vulkan/vulkan_core.h>
typedef VkInstance (*PFN_mlx_get_vk_instance)(mlx_context mlx);
int main(void)
{
mlx_context mlx = mlx_init();
mlx_window_create_info info = { 0 };
info.title = "My window";
info.width = 400;
info.height = 400;
info.is_resizable = true;
mlx_window win = mlx_new_window(mlx, &info);
PFN_mlx_get_vk_instance mlx_get_vk_instance = (PFN_mlx_get_vk_instance)mlx_get_proc_addr(mlx, "mlx_get_vk_instance");
printf("%p\n", mlx_get_vk_instance(mlx));
mlx_destroy_window(mlx, win);
mlx_destroy_context(mlx);
return 0;
}
+4
View File
@@ -0,0 +1,4 @@
#!/bin/bash
bash ./build.sh
./a.out
+11
View File
@@ -0,0 +1,11 @@
#!/bin/bash
if [ -e a.out ]; then
rm a.out
fi
if [ $(uname -s) = 'Darwin' ]; then
clang main.c ../../libmlx.dylib -L /opt/homebrew/lib -lSDL2 -lm -g;
else
clang main.c ../../libmlx.so -lSDL2 -g -Wall -Wextra -Werror -lm;
fi
+99
View File
@@ -0,0 +1,99 @@
#include <math.h>
#include <stddef.h>
#include "../../includes/mlx.h"
#include "../../includes/mlx_extended.h"
typedef struct
{
mlx_context mlx;
mlx_window win;
mlx_image render_target;
mlx_window render_target_window;
} mlx_t;
void update(void* param)
{
mlx_t* mlx = (mlx_t*)param;
mlx_clear_window(mlx->mlx, mlx->win, (mlx_color){ .rgba = 0x334D4DFF });
mlx_string_put(mlx->mlx, mlx->win, 160, 120, (mlx_color){ .rgba = 0xFF2066FF }, "text");
mlx_string_put(mlx->mlx, mlx->win, 20, 50, (mlx_color){ .rgba = 0xFFFFFFFF }, "that's a text");
for(int j = 0, color = 0; j < 400; j++)
{
mlx_pixel_put(mlx->mlx, mlx->win, j, j, (mlx_color){ .rgba = 0xFF0000FF + (color << 8) });
mlx_pixel_put(mlx->mlx, mlx->win, 399 - j, j, (mlx_color){ .rgba = 0x0000FFFF });
color += (color < 255);
}
for(int j = 0; j < 20; j++)
{
for(int k = 0; k < 20; k++)
mlx_pixel_put(mlx->mlx, mlx->win, 220 + j, 160 + k, (mlx_color){ .rgba = 0xFF0000FF });
}
mlx_string_put(mlx->mlx, mlx->render_target_window, 20, 20, (mlx_color){ .rgba = 0xAF2BFFFF }, "yippeeee");
for(int j = 0, color = 0; j < 200; j++)
{
mlx_pixel_put(mlx->mlx, mlx->render_target_window, j, j, (mlx_color){ .rgba = 0xFF0000FF + (color << 8) });
mlx_pixel_put(mlx->mlx, mlx->render_target_window, 199 - j, j, (mlx_color){ .rgba = 0x0000FFFF });
color += (color < 255);
}
static int i = 0;
i++;
mlx_put_transformed_image_to_window(mlx->mlx, mlx->win, mlx->render_target, 5, 100, 1.0f, 1.0f, i);
}
void key_hook(int key, void* param)
{
mlx_t* mlx = (mlx_t*)param;
if(key == 41)
mlx_loop_end(mlx->mlx);
}
void window_hook(int event, void* param)
{
if(event == 0)
mlx_loop_end(((mlx_t*)param)->mlx);
}
int main(void)
{
mlx_t mlx;
mlx.mlx = mlx_init();
mlx_set_fps_goal(mlx.mlx, 60);
mlx_window_create_info info = { 0 };
info.title = "My window";
info.width = 400;
info.height = 400;
info.is_resizable = true;
mlx.win = mlx_new_window(mlx.mlx, &info);
mlx.render_target = mlx_new_image(mlx.mlx, 200, 200);
info.render_target = mlx.render_target;
info.title = NULL;
info.width = 200;
info.height = 200;
mlx.render_target_window = mlx_new_window(mlx.mlx, &info);
mlx_clear_window(mlx.mlx, mlx.render_target_window, (mlx_color){ .rgba = 0xC16868FF });
mlx_on_event(mlx.mlx, mlx.win, MLX_KEYDOWN, key_hook, &mlx);
mlx_on_event(mlx.mlx, mlx.win, MLX_WINDOW_EVENT, window_hook, &mlx);
mlx_add_loop_hook(mlx.mlx, update, &mlx);
mlx_loop(mlx.mlx);
mlx_destroy_window(mlx.mlx, mlx.win);
mlx_destroy_window(mlx.mlx, mlx.render_target_window);
mlx_destroy_image(mlx.mlx, mlx.render_target);
mlx_destroy_context(mlx.mlx);
return 0;
}
+4
View File
@@ -0,0 +1,4 @@
#!/bin/bash
bash ./build.sh
./a.out
+365 -316
View File
@@ -3,26 +3,283 @@
/* ::: :::::::: */
/* mlx.h :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */
/* By: maldavid <contact@kbz8.me> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2022/10/04 16:56:35 by maldavid #+# #+# */
/* Updated: 2024/01/18 14:36:12 by maldavid ### ########.fr */
/* Updated: 2025/10/22 16:59:21 by maldavid ### ########.fr */
/* */
/* ************************************************************************** */
// MacroLibX official repo https://github.com/seekrs/MacroLibX
// MacroLibX official website https://macrolibx.kbz8.me/
#ifndef __MACRO_LIB_X_H__
#define __MACRO_LIB_X_H__
#ifndef MACROLIB_X_H
#define MACROLIB_X_H
#include <stdbool.h>
#include "mlx_profile.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef enum
/* MLX types */
/**
* @brief Opaque handle that represents the MLX context
*/
MLX_DEFINE_HANDLE(mlx_context);
/**
* @brief Opaque handle that represents a MLX window
*/
MLX_DEFINE_HANDLE(mlx_window);
/**
* @brief Opaque handle that represents a MLX image
*/
MLX_DEFINE_HANDLE(mlx_image);
/**
* @brief Union representing RGBA color with access to each part as bytes
*/
typedef union mlx_color
{
struct
{
#if MLX_BYTEORDER == MLX_LITTLE_ENDIAN
uint8_t a;
uint8_t b;
uint8_t g;
uint8_t r;
#else
uint8_t r;
uint8_t g;
uint8_t b;
uint8_t a;
#endif
};
uint32_t rgba;
} mlx_color;
/* MLX backend related functions */
/**
* @brief Initializes the MLX internal application
*
* @return (mlx_context) An opaque handler to the internal MLX application or MLX_NULL_HANDLE (0x0) in case of error
*/
MLX_API mlx_context mlx_init();
/**
* @brief Caps the FPS
*
* @param mlx Internal MLX application
* @param fps The FPS cap or 0 for vsync
*/
MLX_API void mlx_set_fps_goal(mlx_context mlx, int fps);
/**
* @brief Destroy internal MLX application
*
* @param mlx Internal MLX application
*/
MLX_API void mlx_destroy_context(mlx_context mlx);
/* Window related functions */
/**
* @brief Descriptor structure for window creation
*
* Note: if a valid mlx_image is passed as render_target, this window will not be a real system window
* and will rather act as a gate to use any draw function to draw directly on an image.
*
* Ex: you could use mlx_string_put or mlx_pixel_put to draw on a given image and then use this image
* with mlx_put_image_to_window to render it on a real window.
*
* See experimental/RenderToTexture/main.c for a concrete example.
*/
typedef struct mlx_window_create_info
{
mlx_image render_target;
const char* title;
int width;
int height;
bool is_fullscreen;
bool is_resizable;
} mlx_window_create_info;
/**
* @brief Creates a new window
*
* @param mlx Internal MLX application
* @param info Pointer to a descriptor structure
*
* @return (mlx_window) An opaque handler to the internal MLX window or MLX_NULL_HANDLE (0x0) in case of error
*/
MLX_API mlx_window mlx_new_window(mlx_context mlx, const mlx_window_create_info* info);
/**
* @brief Destroys internal window
*
* @param mlx Internal MLX application
* @param win Internal window
*/
MLX_API void mlx_destroy_window(mlx_context mlx, mlx_window win);
/**
* @brief Sets window position
*
* @param mlx Internal MLX application
* @param win Internal window to move
* @param x New x position
* @param y New y position
*/
MLX_API void mlx_set_window_position(mlx_context mlx, mlx_window win, int x, int y);
/**
* @brief Sets window size
*
* @param mlx Internal MLX application
* @param win Internal window to move
* @param width New width
* @param height New height
*/
MLX_API void mlx_set_window_size(mlx_context mlx, mlx_window win, int width, int height);
/**
* @brief Sets window title
*
* @param mlx Internal MLX application
* @param win Internal window to move
* @param title New title
*/
MLX_API void mlx_set_window_title(mlx_context mlx, mlx_window win, const char* title);
/**
* @brief Enables/Disables window fullscreen mode
*
* @param mlx Internal MLX application
* @param win Internal window to move
* @param enable Switch or not to fullscreen
*/
MLX_API void mlx_set_window_fullscreen(mlx_context mlx, mlx_window win, bool enable);
/**
* @brief Gets window position
*
* @param mlx Internal MLX application
* @param win Internal window to move
* @param x Pointers to get position of the window
* @param y Pointers to get position of the window
*/
MLX_API void mlx_get_window_position(mlx_context mlx, mlx_window win, int* x, int* y);
/**
* @brief Gets window size
*
* @param mlx Internal MLX application
* @param win Internal window to move
* @param x Pointers to get size of the window
* @param y Pointers to get size of the window
*/
MLX_API void mlx_get_window_size(mlx_context mlx, mlx_window win, int* x, int* y);
/**
* @brief Clears the given window (resets all rendered data)
*
* @param mlx Internal MLX application
* @param win Internal window
*/
MLX_API void mlx_clear_window(mlx_context mlx, mlx_window win, mlx_color color);
/**
* @brief Get the size of the screen the given window is on
*
* @param mlx Internal MLX application
* @param win Internal window to choose screen the window is on
* @param w Get width size
* @param h Get height size
*/
MLX_API void mlx_get_screen_size(mlx_context mlx, mlx_window win, int* w, int* h);
/* Loop related functions */
/**
* @brief Gives another function to be executed at each loop turn
*
* @param mlx Internal MLX application
* @param f The function
* @param param Param to give to the function passed
*/
MLX_API void mlx_add_loop_hook(mlx_context mlx, void(*f)(void*), void* param);
/**
* @brief Starts the internal main loop
*
* @param mlx Internal MLX application
*/
MLX_API void mlx_loop(mlx_context mlx);
/**
* @brief Ends the internal run loop
*
* @param mlx Internal MLX application
*/
MLX_API void mlx_loop_end(mlx_context mlx);
/* Events related functions */
/**
* @brief Shows mouse cursor
*
* @param mlx Internal MLX application
*/
MLX_API void mlx_mouse_show(mlx_context mlx);
/**
* @brief Hides mouse cursor
*
* @param mlx Internal MLX application
*/
MLX_API void mlx_mouse_hide(mlx_context mlx);
/**
* @brief Moves cursor to givent position
*
* @param mlx Internal MLX application
* @param win Internal window from which cursor moves
* @param x X coordinate
* @param y Y coordinate
*/
MLX_API void mlx_mouse_move(mlx_context mlx, mlx_window win, int x, int y);
/**
* @brief Get cursor's position
*
* @param mlx Internal MLX application
* @param x Get x coordinate
* @param y Get y coordinate
*/
MLX_API void mlx_mouse_get_pos(mlx_context mlx, int* x, int* y);
/**
* @brief Type of event
*/
typedef enum mlx_event_type
{
MLX_KEYDOWN = 0,
MLX_KEYUP = 1,
@@ -32,344 +289,136 @@ typedef enum
MLX_WINDOW_EVENT = 5
} mlx_event_type;
/**
* @brief Initializes the MLX internal application
* @brief Gives a function to be executed on event type, does not override previous functions
*
* @return (void*) An opaque pointer to the internal MLX application or NULL (0x0) in case of error
* @param mlx Internal MLX application
* @param win Internal window
* @param event Event type (see union on top of this file)
* @param f Function to be executed
* @param param Parameter given to the function
*/
MLX_API void* mlx_init();
MLX_API void mlx_on_event(mlx_context mlx, mlx_window win, mlx_event_type event, void(*f)(int, void*), void* param);
/* Pixels drawing related functions */
/**
* @brief Creates a new window
* @brief Put a pixel in the window
*
* @param mlx Internal MLX application
* @param w Width of the window
* @param h Height of the window
* @param title Title of the window
*
* @return (void*) An opaque pointer to the internal MLX window or NULL (0x0) in case of error
* @param mlx Internal MLX application
* @param win Internal window
* @param x X coordinate
* @param y Y coordinate
* @param color Color of the pixel
*/
MLX_API void* mlx_new_window(void* mlx, int w, int h, const char* title);
MLX_API void mlx_pixel_put(mlx_context mlx, mlx_window win, int x, int y, mlx_color color);
/* Images related functions */
/**
* @brief Gives a function to be executed at each loop turn
* @brief Create a new empty image
*
* @param mlx Internal MLX application
* @param f The function
* @param param Param to give to the function passed
* @param mlx Internal MLX application
* @param width Width of the image
* @param height Height of the image
*
* @return (int) Always return 0, made this to copy the behaviour of the original MLX
* @return (mlx_image) An opaque handler to the internal image or MLX_NULL_HANDLE (0x0) in case of error
*/
MLX_API int mlx_loop_hook(void* mlx, int (*f)(void*), void* param);
MLX_API mlx_image mlx_new_image(mlx_context mlx, int width, int height);
/**
* @brief Create a new image from a png/jpg/bmp file
*
* @param mlx Internal MLX application
* @param filename Path to the png file
* @param width Get the width of the image
* @param height Get the height of the image
*
* @return (mlx_image) An opaque handler to the internal image or MLX_NULL_HANDLE (0x0) in case of error
*/
MLX_API mlx_image mlx_new_image_from_file(mlx_context mlx, char* filename, int* width, int* height);
/**
* @brief Destroys internal image
*
* @param mlx Internal MLX application
* @param img Internal image
*/
MLX_API void mlx_destroy_image(mlx_context mlx, mlx_image image);
/**
* @brief Get image pixel data
*
* @param mlx Internal MLX application
* @param img Internal image
* @param x X coordinate in the image
* @param y Y coordinate in the image
*
* @return (int) Return the pixel data
*/
MLX_API mlx_color mlx_get_image_pixel(mlx_context mlx, mlx_image image, int x, int y);
/**
* @brief Set image pixel data
*
* @param mlx Internal MLX application
* @param img Internal image
* @param x X coordinate in the image
* @param y Y coordinate in the image
* @param color Color of the pixel to set
*/
MLX_API void mlx_set_image_pixel(mlx_context mlx, mlx_image image, int x, int y, mlx_color color);
/**
* @brief Put image to the given window
*
* @param mlx Internal MLX application
* @param win Internal window
* @param img Internal image
* @param x X coordinate
* @param y Y coordinate
*/
MLX_API void mlx_put_image_to_window(mlx_context mlx, mlx_window win, mlx_image image, int x, int y);
/* Strings drawing related functions */
/**
* @brief Starts the internal main loop
* @brief Put text in given window
*
* @param mlx Internal MLX application
*
* @return (int) Always return 0, made this to copy the behaviour of the original MLX
* @param mlx Internal MLX application
* @param win Internal window
* @param x X coordinate
* @param y Y coordinate
* @param color Color of the pixel
* @param str Text to put
*/
MLX_API int mlx_loop(void* mlx);
MLX_API void mlx_string_put(mlx_context mlx, mlx_window win, int x, int y, mlx_color color, char* str);
/**
* @brief Ends the internal main loop
* @brief Loads a font to be used by `mlx_string_put`
*
* @param mlx Internal MLX application
*
* @return (int) Always return 0, made this to copy the behaviour of the original MLX
* @param mlx Internal MLX application
* @param filepath Filepath to the font or "default" to reset to the embedded font
*/
MLX_API int mlx_loop_end(void* mlx);
MLX_API void mlx_set_font(mlx_context mlx, char* filepath);
/**
* @brief Shows mouse cursor
* @brief Loads a font to be used by `mlx_string_put` and scales it
*
* @return (int) Always return 0, made this to copy the behaviour of the original MLX
* @param mlx Internal MLX application
* @param filepath Filepath to the font or "default" to reset to the embedded font
* @param scale Scale to apply to the font
*/
MLX_API int mlx_mouse_show();
/**
* @brief Hides mouse cursor
*
* @return (int) Always return 0, made this to copy the behaviour of the original MLX
*/
MLX_API int mlx_mouse_hide();
/**
* @brief Moves cursor to givent position
*
* @param mlx Internal MLX application
* @param win Internal window from which cursor moves
* @param x X coordinate
* @param y Y coordinate
*
* @return (int) Always return 0, made this to copy the behaviour of the original MLX
*/
MLX_API int mlx_mouse_move(void* mlx, void* win, int x, int y);
/**
* @brief Get cursor's position
*
* @param mlx Internal MLX application
* @param x Get x coordinate
* @param y Get y coordinate
*
* @return (int) Always return 0, made this to copy the behaviour of the original MLX
*/
MLX_API int mlx_mouse_get_pos(void* mlx, int* x, int* y);
/**
* @brief Gives a function to be executed on event type
*
* @param mlx Internal MLX application
* @param win Internal window
* @param event Event type (see union on top of this file)
* @param f Function to be executed
* @param param Parameter given to the function
*
* @return (int) Always return 0, made this to copy the behaviour of the original MLX
*/
MLX_API int mlx_on_event(void* mlx, void* win, mlx_event_type event, int (*f)(int, void*), void* param);
/**
* @brief Put a pixel in the window
*
* @param mlx Internal MLX application
* @param win Internal window
* @param x X coordinate
* @param y Y coordinate
* @param color Color of the pixel (coded on 4 bytes in an int, 0xAARRGGBB)
*
* Note : If your're reading pixel colors from an image, don't forget to shift them
* one byte to the right as image pixels are encoded as 0xRRGGBBAA and pixel put takes 0xAARRGGBB.
*
* @return (int) Always return 0, made this to copy the behaviour of the original MLX
*/
MLX_API int mlx_pixel_put(void* mlx, void* win, int x, int y, int color);
/**
* @brief Create a new empty image
*
* @param mlx Internal MLX application
* @param width Width of the image
* @param height Height of the image
*
* @return (void*) An opaque pointer to the internal image or NULL (0x0) in case of error
*/
MLX_API void* mlx_new_image(void* mlx, int width, int height);
/**
* @brief Get image pixel data
*
* @param mlx Internal MLX application
* @param img Internal image
* @param x X coordinate in the image
* @param y Y coordinate in the image
*
* @return (int) Return the pixel data
*
* /!\ If you run into glitches when writing or reading pixels from images /!\
* You need to add IMAGES_OPTIMIZED=false to your make mlx command
* ```
* ~ git clone https://github.com/seekrs/MacroLibX.git
* ~ cd MacroLibX
* ~ make IMAGES_OPTIMIZED=false
* ```
*/
MLX_API int mlx_get_image_pixel(void* mlx, void* img, int x, int y);
/**
* @brief Set image pixel data
*
* @param mlx Internal MLX application
* @param img Internal image
* @param x X coordinate in the image
* @param y Y coordinate in the image
* @param color Color of the pixel to set
*
* @return (void)
*
* /!\ If you run into glitches when writing or reading pixels from images /!\
* You need to add IMAGES_OPTIMIZED=false to your make mlx command
* ```
* ~ git clone https://github.com/seekrs/MacroLibX.git
* ~ cd MacroLibX
* ~ make IMAGES_OPTIMIZED=false
* ```
*/
MLX_API void mlx_set_image_pixel(void* mlx, void* img, int x, int y, int color);
/**
* @brief Put image to the given window
*
* @param mlx Internal MLX application
* @param win Internal window
* @param img Internal image
* @param x X coordinate
* @param y Y coordinate
*
* @return (int) Always return 0, made this to copy the behaviour of the original MLX
*/
MLX_API int mlx_put_image_to_window(void* mlx, void* win, void* img, int x, int y);
/**
* @brief Destroys internal image
*
* @param mlx Internal MLX application
* @param img Internal image
*
* @return (int) Always return 0, made this to copy the behaviour of the original MLX
*/
MLX_API int mlx_destroy_image(void* mlx, void* img);
/**
* @brief Create a new image from a png file
*
* @param mlx Internal MLX application
* @param filename Path to the png file
* @param width Get the width of the image
* @param heigth Get the height of the image
*
* @return (void*) An opaque pointer to the internal image or NULL (0x0) in case of error
*/
MLX_API void* mlx_png_file_to_image(void* mlx, char* filename, int* width, int* height);
/**
* @brief Create a new image from a jpg file
*
* @param mlx Internal MLX application
* @param filename Path to the jpg file
* @param width Get the width of the image
* @param heigth Get the height of the image
*
* @return (void*) An opaque pointer to the internal image or NULL (0x0) in case of error
*/
MLX_API void* mlx_jpg_file_to_image(void* mlx, char* filename, int* width, int* height);
/**
* @brief Create a new image from a bmp file
*
* @param mlx Internal MLX application
* @param filename Path to the bmp file
* @param width Get the width of the image
* @param heigth Get the height of the image
*
* @return (void*) An opaque pointer to the internal image or NULL (0x0) in case of error
*/
MLX_API void* mlx_bmp_file_to_image(void* mlx, char* filename, int* width, int* height);
/**
* @brief Put text in given window
*
* @param mlx Internal MLX application
* @param win Internal window
* @param x X coordinate
* @param y Y coordinate
* @param color Color of the pixel (coded on 4 bytes in an int, 0xAARRGGBB)
* @param str Text to put
*
* @return (int) Always return 0, made this to copy the behaviour of the original MLX
*/
MLX_API int mlx_string_put(void* mlx, void* win, int x, int y, int color, char* str);
/**
* @brief Loads a font to be used by `mlx_string_put`
*
* @param mlx Internal MLX application
* @param win Internal window
* @param filepath Filepath to the font or "default" to reset to the embedded font
*
* @return (void)
*/
MLX_API void mlx_set_font(void* mlx, void* win, char* filepath);
/**
* @brief Loads a font to be used by `mlx_string_put` and scales it
*
* @param mlx Internal MLX application
* @param win Internal window
* @param filepath Filepath to the font or "default" to reset to the embedded font
* @param scale Scale to apply to the font
*
* @return (void)
*/
MLX_API void mlx_set_font_scale(void* mlx, void* win, char* filepath, float scale);
/**
* @brief Clears the given window (resets all rendered data)
*
* @param mlx Internal MLX application
* @param win Internal window
*
* @return (int) Always return 0, made this to copy the behaviour of the original MLX
*/
MLX_API int mlx_clear_window(void* mlx, void* win);
/**
* @brief Destroys internal window
*
* @param mlx Internal MLX application
* @param win Internal window
*
* @return (int) Always return 0, made this to copy the behaviour of the original MLX
*/
MLX_API int mlx_destroy_window(void* mlx, void* win);
/**
* @brief Destroy internal MLX application
*
* @param mlx Internal MLX application
*
* @return (int) Always return 0, made this to copy the behaviour of the original MLX
*/
MLX_API int mlx_destroy_display(void* mlx);
/**
* @brief Get the size of the screen the given window is on
*
* @param mlx Internal MLX application
* @param win Internal window
* @param w Get width size
* @param h Get height size
*
* @return (int) Always return 0, made this to copy the behaviour of the original MLX
*/
MLX_API int mlx_get_screens_size(void* mlx, void* win, int* w, int* h);
/**
* @brief Caps the FPS
*
* @param mlx Internal MLX application
* @param fps The FPS cap
*
* @return (int) Always return 0
*/
MLX_API int mlx_set_fps_goal(void* mlx, int fps);
MLX_API void mlx_set_font_scale(mlx_context mlx, char* filepath, float scale);
#ifdef __cplusplus
}
+171
View File
@@ -0,0 +1,171 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* mlx_extended.h :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: maldavid <contact@kbz8.me> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/12/14 16:17:10 by maldavid #+# #+# */
/* Updated: 2025/10/22 16:59:38 by maldavid ### ########.fr */
/* */
/* ************************************************************************** */
// MacroLibX official repo https://github.com/seekrs/MacroLibX
// MacroLibX official website https://macrolibx.kbz8.me/
#ifndef MACROLIB_X_EXTENDED_H
#define MACROLIB_X_EXTENDED_H
#include "mlx.h"
#include <stddef.h>
#ifdef __cplusplus
extern "C" {
#endif
/* Window related functions */
/**
* @brief Sets maximum window size
*
* @param mlx Internal MLX application
* @param win Internal window to move
* @param x New x maximum size
* @param y New y maximum size
*/
MLX_API void mlx_set_window_max_size(mlx_context mlx, mlx_window win, int x, int y);
/**
* @brief Sets minimum window size
*
* @param mlx Internal MLX application
* @param win Internal window to move
* @param x New x minimum size
* @param y New y minimum size
*/
MLX_API void mlx_set_window_min_size(mlx_context mlx, mlx_window win, int x, int y);
/**
* @brief Maximizes a window
*
* @param mlx Internal MLX application
* @param win Internal window to move
*/
MLX_API void mlx_maximise_window(mlx_context mlx, mlx_window win);
/**
* @brief Minimizes a window
*
* @param mlx Internal MLX application
* @param win Internal window to move
*/
MLX_API void mlx_minimize_window(mlx_context mlx, mlx_window win);
/**
* @brief Restore window to formal size
*
* @param mlx Internal MLX application
* @param win Internal window to move
*/
MLX_API void mlx_restore_window(mlx_context mlx, mlx_window win);
/* Pixels drawing related functions */
/**
* @brief Put an array of pixels in the window
*
* @param mlx Internal MLX application
* @param win Internal window
* @param x X coordinate
* @param y Y coordinate
* @param pixels Array of pixels
* @param pixels_number Number of pixels
*/
MLX_API void mlx_pixel_put_array(mlx_context mlx, mlx_window win, int x, int y, mlx_color* pixels, size_t pixels_number);
/**
* @brief Put a region of pixels in the window
*
* @param mlx Internal MLX application
* @param win Internal window
* @param x X coordinate
* @param y Y coordinate
* @param w Width
* @param h Height
* @param pixels Array of pixels
*
* Note: it is responsability of the user to make sure the size of `pixels` is
* big enough for the given region.
*/
MLX_API void mlx_pixel_put_region(mlx_context mlx, mlx_window win, int x, int y, int w, int h, mlx_color* pixels);
/* Images related functions */
/**
* @brief Get image region
*
* @param mlx Internal MLX application
* @param img Internal image
* @param x X coordinate in the image
* @param y Y coordinate in the image
* @param w Width of the region
* @param y Height of the region
* @param dst Array of pixels to copy to
*
* Note: it is responsability of the user to make sure the size of `dst` is
* big enough for the given region.
*/
MLX_API void mlx_get_image_region(mlx_context mlx, mlx_image image, int x, int y, int w, int h, mlx_color* dst);
/**
* @brief Set image region
*
* @param mlx Internal MLX application
* @param img Internal image
* @param x X coordinate in the image
* @param y Y coordinate in the image
* @param w Width of the region
* @param y Height of the region
* @param pixels Array of pixels to copy from
*
* Note: it is responsability of the user to make sure the size of `pixels` is
* big enough for the given region.
*/
MLX_API void mlx_set_image_region(mlx_context mlx, mlx_image image, int x, int y, int w, int h, mlx_color* pixels);
/**
* @brief Transform and put image to the given window
*
* @param mlx Internal MLX application
* @param win Internal window
* @param img Internal image
* @param x X coordinate
* @param y Y coordinate
* @param scale_x Scale x of the image
* @param scale_y Scale y of the image
* @param angle Rotation angle of the image (clockwise)
*/
MLX_API void mlx_put_transformed_image_to_window(mlx_context mlx, mlx_window win, mlx_image image, int x, int y, float scale_x, float scale_y, float angle);
/**
* @brief Get direct pointers to hidden functions
*
* @param mlx Internal MLX application
*
* @return (mlx_function) A function pointer or NULL (0x0) in case of error
*/
MLX_API mlx_function mlx_get_proc_addr(mlx_context mlx, const char* name);
#ifdef __cplusplus
}
#endif
#endif
+82 -14
View File
@@ -6,12 +6,12 @@
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2023/11/10 08:49:17 by maldavid #+# #+# */
/* Updated: 2024/01/03 15:33:35 by maldavid ### ########.fr */
/* Updated: 2025/10/22 13:38:43 by maldavid ### ########.fr */
/* */
/* ************************************************************************** */
#ifndef __MLX_PROFILE__
#define __MLX_PROFILE__
#ifndef MACROLIBX_PROFILE_H
#define MACROLIBX_PROFILE_H
// Try to identify the compiler
#if defined(__BORLANDC__)
@@ -49,6 +49,14 @@
#define MLX_PLAT_MACOS
#elif defined(unix) || defined(__unix__) || defined(__unix)
#define MLX_PLAT_UNIX
#elif defined(__sun) && defined(__SVR4)
#define MLX_PLAT_SOLARIS
#elif defined(__OpenBSD__)
#define MLX_PLAT_OPENBSD
#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
#define MLX_PLAT_FREEBSD
#elif defined(__NetBSD__)
#define MLX_PLAT_NETBSD
#else
#error "Unknown environment (not Windows, not Linux, not MacOS, not Unix)"
#endif
@@ -121,27 +129,89 @@
#if defined(MLX_PLAT_WINDOWS)
#define VK_USE_PLATFORM_WIN32_KHR
#ifdef __cplusplus
constexpr const char* VULKAN_LIB_NAME = "vulkan-1.dll";
#endif
#define VULKAN_LIB_NAME "vulkan-1.dll"
#elif defined(MLX_PLAT_MACOS)
#define VK_USE_PLATFORM_MACOS_MVK
#define VK_USE_PLATFORM_METAL_EXT
#ifdef __cplusplus
constexpr const char* VULKAN_LIB_NAME = "libvulkan.dylib / libvulkan.1.dylib / libMoltenVK.dylib";
#endif
#define VULKAN_LIB_NAME "libvulkan.dylib / libvulkan.1.dylib / libMoltenVK.dylib"
#else
#define VK_USE_PLATFORM_XLIB_KHR
#define VK_USE_PLATFORM_WAYLAND_KHR
#ifdef __cplusplus
constexpr const char* VULKAN_LIB_NAME = "libvulkan.so / libvulkan.so.1";
#define VULKAN_LIB_NAME "libvulkan.so / libvulkan.so.1"
#endif
#if !defined(MLX_FORCEINLINE)
#if defined(MLX_COMPILER_CLANG) || defined(MLX_COMPILER_GCC)
#define MLX_FORCEINLINE __attribute__((always_inline)) inline
#elif defined(MLX_COMPILER_MSVC)
#define MLX_FORCEINLINE __forceinline
#else
#define MLX_FORCEINLINE inline
#endif
#endif
#define MLX_LITTLE_ENDIAN 1234
#define MLX_BIG_ENDIAN 4321
#ifndef MLX_BYTEORDER
#if defined(MLX_PLAT_LINUX)
#include <endian.h>
#define MLX_BYTEORDER __BYTE_ORDER
#elif defined(MLX_PLAT_SOLARIS)
#include <sys/byteorder.h>
#if defined(_LITTLE_ENDIAN)
#define MLX_BYTEORDER MLX_LITTLE_ENDIAN
#elif defined(_BIG_ENDIAN)
#define MLX_BYTEORDER MLX_BIG_ENDIAN
#else
#error Unsupported endianness
#endif
#elif defined(MLX_PLAT_OPENBSD) || defined(__DragonFly__)
#include <endian.h>
#define MLX_BYTEORDER BYTE_ORDER
#elif defined(MLX_PLAT_FREEBSD) || defined(MLX_PLAT_NETBSD)
#include <sys/endian.h>
#define MLX_BYTEORDER BYTE_ORDER
#elif defined(__ORDER_LITTLE_ENDIAN__) && defined(__ORDER_BIG_ENDIAN__) && defined(__BYTE_ORDER__)
#if (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
#define MLX_BYTEORDER MLX_LITTLE_ENDIAN
#elif (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)
#define MLX_BYTEORDER MLX_BIG_ENDIAN
#else
#error Unsupported endianness
#endif
#else
#if defined(__hppa__) || \
defined(__m68k__) || defined(mc68000) || defined(_M_M68K) || \
(defined(__MIPS__) && defined(__MIPSEB__)) || \
defined(__ppc__) || defined(__POWERPC__) || defined(__powerpc__) || defined(__PPC__) || \
defined(__sparc__) || defined(__sparc)
#define MLX_BYTEORDER MLX_BIG_ENDIAN
#else
#define MLX_BYTEORDER MLX_LITTLE_ENDIAN
#endif
#endif
#endif
#include <stdint.h>
#define MLX_MAKE_VERSION(major, minor, patch) ((((uint32_t)(major)) << 22U) | (((uint32_t)(minor)) << 12U) | ((uint32_t)(patch)))
#define MLX_VERSION_MAJOR(version) (((uint32_t)(version) >> 22U) & 0x7FU)
#define MLX_VERSION_MINOR(version) (((uint32_t)(version) >> 12U) & 0x3FFU)
#define MLX_VERSION_PATCH(version) ((uint32_t)(version) & 0xFFFU)
#define MLX_DEFINE_HANDLE(object) typedef struct object##_handler* object
#define MLX_NULL_HANDLE NULL
typedef void (*mlx_function)(void);
#define MLX_VERSION MLX_MAKE_VERSION(2, 2, 4)
#define MLX_TARGET_VULKAN_API_VERSION MLX_MAKE_VERSION(1, 0, 0)
// Checking common assumptions
#ifdef __cplusplus
#include <climits>
#include <cstdint>
static_assert(CHAR_BIT == 8, "CHAR_BIT is expected to be 8");
@@ -159,7 +229,6 @@
#include <assert.h>
#endif
#include <limits.h>
#include <stdint.h>
static_assert(CHAR_BIT == 8, "CHAR_BIT is expected to be 8");
@@ -176,7 +245,6 @@
#define STATIC_ASSERT(COND, MSG) typedef char static_assertion___##MSG[(COND)?1:-1]
#include <limits.h>
#include <stdint.h>
STATIC_ASSERT(CHAR_BIT == 8, CHAR_BIT_is_expected_to_be_8);
+106
View File
@@ -0,0 +1,106 @@
project('MacroLibX',
['c', 'cpp'],
version : '2.3.0',
license : 'MIT',
meson_version : '>= 0.63.0',
default_options : [
'warning_level=2',
'optimization=3',
'cpp_std=c++20',
]
)
add_project_arguments('-DSDL_MAIN_HANDLED', language : 'c')
if get_option('graphics_memory_dump')
add_project_arguments('-DGRAPHICS_MEMORY_DUMP', language : 'c')
endif
if get_option('profiler')
add_project_arguments('-DPROFILER_ENABLED', language : 'c')
endif
if get_option('force_wayland')
add_project_arguments('-DFORCE_WAYLAND', language : 'c')
endif
if get_option('disable_all_safeties')
add_project_arguments('-DDISABLE_ALL_SAFETIES', language : 'c')
endif
includes_directories = include_directories(
'includes',
'runtime/Includes',
'runtime/Sources',
'third_party',
)
sources = files(
'runtime/Sources/Core/Application.cpp',
'runtime/Sources/Core/Bridge.cpp',
'runtime/Sources/Core/EventBus.cpp',
'runtime/Sources/Core/EventListener.cpp',
'runtime/Sources/Core/Fps.cpp',
'runtime/Sources/Core/Graphics.cpp',
'runtime/Sources/Core/Logs.cpp',
'runtime/Sources/Core/Memory.cpp',
'runtime/Sources/Core/Profiler.cpp',
'runtime/Sources/Core/SDLManager.cpp',
'runtime/Sources/Core/UUID.cpp',
'runtime/Sources/Graphics/Font.cpp',
'runtime/Sources/Graphics/Mesh.cpp',
'runtime/Sources/Graphics/PutPixelManager.cpp',
'runtime/Sources/Graphics/Scene.cpp',
'runtime/Sources/Graphics/Sprite.cpp',
'runtime/Sources/Graphics/Text.cpp',
'runtime/Sources/Platform/Inputs.cpp',
'runtime/Sources/Platform/Window.cpp',
'runtime/Sources/Renderer/Pipelines/Graphics.cpp',
'runtime/Sources/Renderer/Pipelines/Shader.cpp',
'runtime/Sources/Renderer/RenderPasses/2DPass.cpp',
'runtime/Sources/Renderer/RenderPasses/FinalPass.cpp',
'runtime/Sources/Renderer/RenderPasses/Passes.cpp',
'runtime/Sources/Renderer/Vulkan/VulkanLoader.cpp',
'runtime/Sources/Renderer/Buffer.cpp',
'runtime/Sources/Renderer/Descriptor.cpp',
'runtime/Sources/Renderer/Image.cpp',
'runtime/Sources/Renderer/Memory.cpp',
'runtime/Sources/Renderer/RenderCore.cpp',
'runtime/Sources/Renderer/Renderer.cpp',
'runtime/Sources/Renderer/SceneRenderer.cpp',
'runtime/Sources/Renderer/Swapchain.cpp',
)
mlx_headers = [
'includes/mlx.h',
'includes/mlx_extended.h',
'includes/mlx_profile.h'
]
install_headers(mlx_headers)
deps = dependency('sdl2')
libmlx = library('mlx',
sources,
include_directories : includes_directories,
dependencies : deps,
install : true)
libmlx_dep = declare_dependency(
include_directories: includes_directories,
dependencies : deps,
link_with : libmlx)
meson.override_dependency('mlx', libmlx_dep)
# PKG CONFIG GENERATION
pkg_mod = import('pkgconfig')
pkg_mod.generate(
libmlx,
name : 'mlx',
description : 'MacroLibX Library',
version : meson.project_version(),
subdirs : ['.'],
)
+23
View File
@@ -0,0 +1,23 @@
option('graphics_memory_dump',
type : 'boolean',
value : false,
description : 'Enable graphics memory dump for debugging purposes.'
)
option('profiler',
type : 'boolean',
value : false,
description : 'Enable profiler for performance analysis.'
)
option('force_wayland',
type : 'boolean',
value : false,
description : 'Force the application to use Wayland display server.'
)
option('disable_all_safeties',
type : 'boolean',
value : false,
description : 'Disable all safety checks in the application.'
)
+73
View File
@@ -0,0 +1,73 @@
#ifndef __MLX_APPLICATION__
#define __MLX_APPLICATION__
#include <Core/Graphics.h>
#include <Platform/Inputs.h>
#include <Core/ImagesRegistry.h>
#include <Core/SDLManager.h>
#include <Core/Memory.h>
#include <Core/Fps.h>
#include <Graphics/Font.h>
#include <Graphics/Mesh.h>
namespace mlx
{
class Application
{
public:
Application();
inline void GetMousePos(int* x, int* y) noexcept;
inline void GetScreenSize(mlx_window win, int* w, int* h) noexcept;
inline void SetFPSCap(std::uint32_t fps) noexcept;
inline void OnEvent(mlx_window win, int event, void(*f)(int, void*), void* param) noexcept;
inline mlx_window NewGraphicsSuport(const mlx_window_create_info* info);
inline NonOwningPtr<GraphicsSupport> GetGraphicsSupport(mlx_window win);
inline void DestroyGraphicsSupport(mlx_window win);
mlx_image NewTexture(int w, int h);
mlx_image NewStbTexture(char* file, int* w, int* h); // stb textures are image files (png, jpg, bpm, ...)
inline NonOwningPtr<Texture> GetTexture(mlx_image image);
void DestroyTexture(mlx_image img);
inline void AddLoopHook(void(*f)(void*), void* param);
inline void LoopEnd() noexcept;
inline void LoadFont(const std::filesystem::path& filepath, float scale);
void Run() noexcept;
~Application();
private:
struct Hook
{
std::function<void(void*)> fn;
void* param;
Hook(std::function<void(void*)> fn, void* param) : fn(fn), param(param) {}
};
private:
std::unique_ptr<MemManager> p_mem_manager; // Putting ptr here to initialise them before inputs, even if it f*cks the padding
std::unique_ptr<SDLManager> p_sdl_manager;
FpsManager m_fps;
Inputs m_in;
FontRegistry m_font_registry;
ImageRegistry m_image_registry;
MeshRegistry m_mesh_registry;
std::vector<std::unique_ptr<GraphicsSupport>> m_graphics;
std::vector<Hook> m_hooks;
std::shared_ptr<Font> p_last_font_bound;
std::unique_ptr<RenderCore> p_render_core;
#ifdef PROFILER
std::unique_ptr<Profiler> p_profiler;
#endif
};
}
#include <Core/Application.inl>
#endif // __MLX_APPLICATION__
+142
View File
@@ -0,0 +1,142 @@
#pragma once
#include <Core/Application.h>
#include <Core/Handles.h>
#include <Embedded/DogicaTTF.h>
#ifndef DISABLE_ALL_SAFETIES
#define CHECK_WINDOW_PTR(win, retval) \
if(win == nullptr) \
{ \
Error("invalid window handle (NULL)"); \
return retval; \
} \
else if(std::find_if(m_graphics.begin(), m_graphics.end(), [win](const std::unique_ptr<GraphicsSupport>& gs){ return gs && win->id == gs->GetID(); }) == m_graphics.end()) \
{ \
Error("invalid window handle"); \
return retval; \
} else {}
#define CHECK_IMAGE_PTR(img, retval) \
if(img == nullptr) \
{ \
Error("invalid image handle (NULL)"); \
return retval; \
} \
else if(!m_image_registry.IsTextureKnown(image->texture)) \
{ \
Error("invalid image handle"); \
return retval; \
} else {}
#else
#define CHECK_WINDOW_PTR(win, retval)
#define CHECK_IMAGE_PTR(img, retval)
#endif
namespace mlx
{
void Application::GetMousePos(int* x, int* y) noexcept
{
*x = m_in.GetX();
*y = m_in.GetY();
}
void Application::OnEvent(mlx_window win, int event, void(*f)(int, void*), void* param) noexcept
{
CHECK_WINDOW_PTR(win, );
if(!m_graphics[win->id]->HasWindow())
return;
m_in.OnEvent(m_graphics[win->id]->GetWindow()->GetID(), event, f, param);
}
void Application::SetFPSCap(std::uint32_t fps) noexcept
{
if(fps == 0)
{
SDL_DisplayMode mode;
if(!SDL_GetCurrentDisplayMode(1, &mode))
return;
fps = mode.refresh_rate;
}
m_fps.SetMaxFPS(fps);
}
mlx_window Application::NewGraphicsSuport(const mlx_window_create_info* info)
{
MLX_PROFILE_FUNCTION();
if(!info)
{
Error("invalid window create info (NULL)");
return nullptr;
}
mlx_window window;
try { window = new mlx_window_handler; }
catch(...) { return nullptr; }
m_graphics.emplace_back(std::make_unique<GraphicsSupport>(info, m_graphics.size()));
if(m_graphics.back()->HasWindow())
m_in.RegisterWindow(m_graphics.back()->GetWindow());
m_graphics.back()->GetScene().BindFont(p_last_font_bound);
window->id = m_graphics.back()->GetID();
return window;
}
NonOwningPtr<GraphicsSupport> Application::GetGraphicsSupport(mlx_window win)
{
CHECK_WINDOW_PTR(win, nullptr);
return m_graphics[win->id].get();
}
void Application::DestroyGraphicsSupport(mlx_window win)
{
MLX_PROFILE_FUNCTION();
CHECK_WINDOW_PTR(win, );
m_graphics[win->id].reset();
delete win;
}
void Application::LoadFont(const std::filesystem::path& filepath, float scale)
{
MLX_PROFILE_FUNCTION();
std::shared_ptr<Font> font = m_font_registry.GetFont(filepath, scale);
if(!font)
{
if(filepath.string() == "default")
font = std::make_shared<Font>("default", dogica_ttf, scale);
else
font = std::make_shared<Font>(filepath, scale);
font->BuildFont();
m_font_registry.RegisterFont(font);
}
p_last_font_bound = font;
for(auto& gs : m_graphics)
{
if(gs)
gs->GetScene().BindFont(font);
}
}
NonOwningPtr<Texture> Application::GetTexture(mlx_image image)
{
CHECK_IMAGE_PTR(image, nullptr);
NonOwningPtr<Texture> texture = image->texture;
if(!texture->IsInit())
{
Error("trying to use a texture that has been destroyed");
return nullptr;
}
return texture;
}
void Application::AddLoopHook(void(*f)(void*), void* param)
{
m_hooks.emplace_back(f, param);
}
void Application::LoopEnd() noexcept
{
m_in.Finish();
}
}
+31
View File
@@ -0,0 +1,31 @@
#ifndef __MLX_CORE_ENUMS__
#define __MLX_CORE_ENUMS__
#include <cstddef>
namespace mlx
{
enum class LogType
{
Message = 0,
Warning,
Error,
FatalError,
Debug,
EndEnum
};
constexpr std::size_t LogTypeCount = static_cast<std::size_t>(LogType::EndEnum);
enum class Event
{
ResizeEventCode = 56,
FrameBeginEventCode = 57,
FatalErrorEventCode = 168,
EndEnum
};
constexpr std::size_t EventCount = static_cast<std::size_t>(Event::EndEnum);
}
#endif
+12
View File
@@ -0,0 +1,12 @@
#ifndef __MLX_BASE_EVENT__
#define __MLX_BASE_EVENT__
namespace mlx
{
struct EventBase
{
virtual Event What() const = 0;
};
}
#endif
+23
View File
@@ -0,0 +1,23 @@
#ifndef __MLX_EVENT_BUS__
#define __MLX_EVENT_BUS__
#include <Core/EventBase.h>
#include <Core/EventListener.h>
namespace mlx
{
class EventBus
{
public:
EventBus() = delete;
static void Send(const std::string& listener_name, const EventBase& event);
static void SendBroadcast(const EventBase& event);
inline static void RegisterListener(const EventListener& listener) { s_listeners.push_back(listener); }
~EventBus() = delete;
private:
inline static std::vector<EventListener> s_listeners;
};
}
#endif
+25
View File
@@ -0,0 +1,25 @@
#ifndef __MLX_EVENT_LISTENER__
#define __MLX_EVENT_LISTENER__
#include <Core/EventBase.h>
namespace mlx
{
class EventListener
{
public:
EventListener() = delete;
EventListener(std::function<void(const EventBase&)> functor, std::string name);
inline const std::string& GetName() const { return m_name; }
inline void Call(const EventBase& event) const noexcept { m_listen_functor(event); }
~EventListener() = default;
private:
std::function<void(const EventBase&)> m_listen_functor;
std::string m_name;
};
}
#endif
+18
View File
@@ -0,0 +1,18 @@
#ifndef __MLX_FORMAT__
#define __MLX_FORMAT__
namespace mlx
{
template<typename T, typename = void>
struct IsOstreamable : std::false_type {};
template<typename T>
struct IsOstreamable<T, std::void_t<decltype(std::declval<std::ostream>() << std::declval<T>())>> : std::true_type {};
template<typename... Args, std::enable_if_t<std::conjunction_v<IsOstreamable<Args>...>, int> = 0>
auto Format(std::string_view format, const Args&... args);
}
#include <Core/Format.inl>
#endif
+133
View File
@@ -0,0 +1,133 @@
#pragma once
#include <Core/Format.h>
namespace mlx
{
namespace Internal
{
template<typename It>
void Format(std::stringstream& ss, It first, It last)
{
for(auto it = first; it != last; ++it)
{
switch(*it)
{
case '%':
throw std::invalid_argument{"too few arguments"};
case '/':
++it;
if(it == last)
throw std::invalid_argument{"stray '/'"};
[[fallthrough]];
default: ss << *it;
}
}
}
template<typename It, typename T, typename... Args>
void Format(std::stringstream& ss, It first, It last, const T& arg, const Args&... args)
{
for(auto it = first; it != last; ++it)
{
switch(*it)
{
case '%':
ss << arg;
return Format(ss, ++it, last, args...);
case '/':
++it;
if(it == last)
throw std::invalid_argument{"stray '/'"};
[[fallthrough]];
default: ss << *it;
}
}
throw std::invalid_argument{"too many arguments"};
}
template<typename It>
void Format(std::ostream& os, It first, It last)
{
for(auto it = first; it != last; ++it)
{
switch(*it)
{
case '%':
throw std::invalid_argument{"too few arguments"};
case '/':
++it;
if(it == last)
throw std::invalid_argument{"stray '/'"};
[[fallthrough]];
default: os << *it;
}
}
}
template<typename It, typename T, typename... Args>
void Format(std::ostream& os, It first, It last, const T& arg, const Args&... args)
{
for(auto it = first; it != last; ++it)
{
switch(*it)
{
case '%':
os << arg;
return Format(os, ++it, last, args...);
case '/':
++it;
if(it == last)
throw std::invalid_argument{"stray '/'"};
[[fallthrough]];
default: os << *it;
}
}
throw std::invalid_argument{"too many arguments"};
}
template<typename... Args>
struct Formatter
{
std::string_view format;
std::tuple<const Args&...> args;
};
template<typename... Args, std::size_t... Is>
void FormatHelper(std::stringstream& ss, const Formatter<Args...>& formatter, std::index_sequence<Is...>)
{
Format(ss, formatter.format.begin(), formatter.format.end(),
std::get<Is>(formatter.args)...);
}
template<typename... Args>
std::stringstream& operator<<(std::stringstream& ss, const Formatter<Args...>& printer)
{
FormatHelper(ss, printer, std::index_sequence_for<Args...>{});
return ss;
}
template<typename... Args, std::size_t... Is>
void FormatHelper(std::ostream& os, const Formatter<Args...>& formatter, std::index_sequence<Is...>)
{
Format(os, formatter.format.begin(), formatter.format.end(),
std::get<Is>(formatter.args)...);
}
template<typename... Args>
std::ostream& operator<<(std::ostream& os, const Formatter<Args...>& printer)
{
FormatHelper(os, printer, std::index_sequence_for<Args...>{});
return os;
}
}
template<typename... Args, std::enable_if_t<std::conjunction_v<IsOstreamable<Args>...>, int>>
auto Format(std::string_view format, const Args&... args)
{
return Internal::Formatter<Args...>{format, std::forward_as_tuple(args...)};
}
}
+27
View File
@@ -0,0 +1,27 @@
#ifndef __MLX_FPS__
#define __MLX_FPS__
namespace mlx
{
class FpsManager
{
public:
FpsManager() = default;
void Init();
bool Update();
inline void SetMaxFPS(std::uint32_t fps) noexcept { m_max_fps = fps; m_ns = 1000000000.0 / fps; }
~FpsManager() = default;
private:
double m_ns = 1000000000.0 / 1'337'000.0;
std::int64_t m_fps_before = 0;
std::int64_t m_fps_now = 0;
std::int64_t m_timer = 0;
std::uint32_t m_max_fps = 1'337'000;
std::uint32_t m_fps_elapsed_time = 0;
};
}
#endif
+72
View File
@@ -0,0 +1,72 @@
#ifndef __MLX_GRAPHICS__
#define __MLX_GRAPHICS__
#include <mlx.h>
#include <Platform/Window.h>
#include <Renderer/Renderer.h>
#include <Graphics/Scene.h>
#include <Graphics/Sprite.h>
#include <Graphics/PutPixelManager.h>
#include <Renderer/ScenesRenderer.h>
#include <Maths/Mat4.h>
namespace mlx
{
class GraphicsSupport : public NonCopyable
{
public:
GraphicsSupport(const mlx_window_create_info* info, int id);
[[nodiscard]] MLX_FORCEINLINE int& GetID() noexcept { return m_id; }
[[nodiscard]] inline std::shared_ptr<Window> GetWindow() { return p_window; }
void Render() noexcept;
void ResetRenderData(mlx_color color) noexcept;
void PixelPut(int x, int y, mlx_color color) noexcept;
void PixelPutArray(int x, int y, mlx_color* color, std::size_t pixels_size) noexcept;
void PixelPutRegion(int x, int y, int w, int h, mlx_color* color) noexcept;
void StringPut(int x, int y, mlx_color color, std::string str);
void TexturePut(NonOwningPtr<class Texture> texture, int x, int y, float scale_x, float scale_y, float angle);
inline void TryEraseSpritesInScene(NonOwningPtr<Texture> texture) noexcept;
inline void AddPreRenderHook(void(*f)(VkCommandBuffer, void*), void* param);
[[nodiscard]] MLX_FORCEINLINE bool HasWindow() const noexcept { return m_has_window; }
[[nodiscard]] MLX_FORCEINLINE Renderer& GetRenderer() { return m_renderer; }
[[nodiscard]] MLX_FORCEINLINE Scene& GetScene() { return *p_scene; }
~GraphicsSupport();
private:
struct Hook
{
std::function<void(VkCommandBuffer, void*)> fn;
void* param;
Hook(std::function<void(VkCommandBuffer, void*)> fn, void* param) : fn(fn), param(param) {}
};
private:
Renderer m_renderer;
SceneRenderer m_scene_renderer;
PutPixelManager m_put_pixel_manager;
std::vector<Hook> m_hooks;
std::shared_ptr<Window> p_window;
std::unique_ptr<Scene> p_scene;
std::uint64_t m_draw_layer = 0;
int m_id;
bool m_has_window;
bool m_pixelput_called = false;
};
}
#include <Core/Graphics.inl>
#endif
+16
View File
@@ -0,0 +1,16 @@
#pragma once
#include <Core/Graphics.h>
namespace mlx
{
void GraphicsSupport::TryEraseSpritesInScene(NonOwningPtr<Texture> texture) noexcept
{
MLX_PROFILE_FUNCTION();
p_scene->TryEraseSpriteFromTexture(texture);
}
void GraphicsSupport::AddPreRenderHook(void(*f)(VkCommandBuffer, void*), void* param)
{
m_hooks.emplace_back(f, param);
}
}
+22
View File
@@ -0,0 +1,22 @@
#ifndef __MLX_HANDLES__
#define __MLX_HANDLES__
extern "C"
{
struct mlx_context_handler
{
mlx::NonOwningPtr<mlx::Application> app;
};
struct mlx_window_handler
{
int id;
};
struct mlx_image_handler
{
mlx::NonOwningPtr<mlx::Texture> texture;
};
}
#endif
+24
View File
@@ -0,0 +1,24 @@
#ifndef __MLX_CORE_IMAGES_REGISTRY__
#define __MLX_CORE_IMAGES_REGISTRY__
namespace mlx
{
class ImageRegistry
{
public:
ImageRegistry() = default;
inline void RegisterTexture(NonOwningPtr<class Texture> texture);
inline void UnregisterTexture(NonOwningPtr<class Texture> texture);
inline bool IsTextureKnown(NonOwningPtr<class Texture> texture);
~ImageRegistry() = default;
private:
std::unordered_set<NonOwningPtr<class Texture>> m_textures_registry;
};
}
#include <Core/ImagesRegistry.inl>
#endif
+20
View File
@@ -0,0 +1,20 @@
#pragma once
#include <Core/ImagesRegistry.h>
namespace mlx
{
void ImageRegistry::RegisterTexture(NonOwningPtr<class Texture> texture)
{
m_textures_registry.insert(texture);
}
void ImageRegistry::UnregisterTexture(NonOwningPtr<class Texture> texture)
{
m_textures_registry.erase(texture);
}
bool ImageRegistry::IsTextureKnown(NonOwningPtr<class Texture> texture)
{
return m_textures_registry.find(texture) != m_textures_registry.end();
}
}
+72
View File
@@ -0,0 +1,72 @@
#ifndef __MLX_LOGS__
#define __MLX_LOGS__
#include <Core/Enums.h>
namespace mlx
{
template<typename... Args>
void DebugLog(unsigned int line, std::string_view file, std::string_view function, std::string message, const Args&... args);
template<typename... Args>
void Error(unsigned int line, std::string_view file, std::string_view function, std::string message, const Args&... args);
template<typename... Args>
void Warning(unsigned int line, std::string_view file, std::string_view function, std::string message, const Args&... args);
template<typename... Args>
void Message(unsigned int line, std::string_view file, std::string_view function, std::string message, const Args&... args);
template<typename... Args>
void FatalError(unsigned int line, std::string_view file, std::string_view function, std::string message, const Args&... args);
template<typename... Args>
void Verify(bool cond, unsigned int line, std::string_view file, std::string_view function, std::string message, const Args&... args);
class Logs
{
public:
Logs() = delete;
static void Report(LogType type, std::string message);
static void Report(LogType type, unsigned int line, std::string_view file, std::string_view function, std::string message);
~Logs() = delete;
};
#ifdef DEBUG
template<typename... Args>
void Assert(bool cond, unsigned int line, std::string_view file, std::string_view function, std::string message, const Args&... args);
#else
template<typename... Args>
void Assert([[maybe_unused]] bool cond, [[maybe_unused]] unsigned int line, [[maybe_unused]] std::string_view file, [[maybe_unused]] std::string_view function, [[maybe_unused]] std::string message, [[maybe_unused]] const Args&... args) {}
#endif
}
#include <Core/Logs.inl>
namespace mlx
{
#undef DebugLog
#define DebugLog(...) DebugLog(__LINE__, __FILE__, __func__, __VA_ARGS__)
#undef Message
#define Message(...) Message(__LINE__, __FILE__, __func__, __VA_ARGS__)
#undef Warning
#define Warning(...) Warning(__LINE__, __FILE__, __func__, __VA_ARGS__)
#undef Error
#define Error(...) Error(__LINE__, __FILE__, __func__, __VA_ARGS__)
#undef FatalError
#define FatalError(...) FatalError(__LINE__, __FILE__, __func__, __VA_ARGS__)
#undef Verify
#define Verify(cond, ...) Verify(cond, __LINE__, __FILE__, __func__, __VA_ARGS__)
#undef Assert
#define Assert(cond, ...) Assert(cond, __LINE__, __FILE__, __func__, __VA_ARGS__)
}
#endif
+124
View File
@@ -0,0 +1,124 @@
#pragma once
#include <Core/Logs.h>
#include <Core/Format.h>
namespace mlx
{
template<typename... Args>
void DebugLog(unsigned int line, std::string_view file, std::string_view function, std::string message, const Args&... args)
{
using namespace std::literals;
try
{
std::stringstream ss;
ss << Format(message, args...);
Logs::Report(LogType::Debug, line, file, function, ss.str());
}
catch(const std::exception& e)
{
Logs::Report(LogType::Error, line, file, function, "formatter exception catched in the log printer: "s + e.what());
}
}
template<typename... Args>
void Error(unsigned int line, std::string_view file, std::string_view function, std::string message, const Args&... args)
{
using namespace std::literals;
try
{
std::stringstream ss;
ss << Format(message, args...);
Logs::Report(LogType::Error, line, file, function, ss.str());
}
catch(const std::exception& e)
{
Logs::Report(LogType::Error, line, file, function, "formatter exception catched in the log printer: "s + e.what());
}
}
template<typename... Args>
void Warning(unsigned int line, std::string_view file, std::string_view function, std::string message, const Args&... args)
{
using namespace std::literals;
try
{
std::stringstream ss;
ss << Format(message, args...);
Logs::Report(LogType::Warning, line, file, function, ss.str());
}
catch(const std::exception& e)
{
Logs::Report(LogType::Error, line, file, function, "formatter exception catched in the log printer: "s + e.what());
}
}
template<typename... Args>
void Message(unsigned int line, std::string_view file, std::string_view function, std::string message, const Args&... args)
{
using namespace std::literals;
try
{
std::stringstream ss;
ss << Format(message, args...);
Logs::Report(LogType::Message, line, file, function, ss.str());
}
catch(const std::exception& e)
{
Logs::Report(LogType::Error, line, file, function, "formatter exception catched in the log printer: "s + e.what());
}
}
template<typename... Args>
void FatalError(unsigned int line, std::string_view file, std::string_view function, std::string message, const Args&... args)
{
using namespace std::literals;
try
{
std::stringstream ss;
ss << Format(message, args...);
Logs::Report(LogType::FatalError, line, file, function, ss.str());
}
catch(const std::exception& e)
{
Logs::Report(LogType::FatalError, line, file, function, "formatter exception catched in the log printer: "s + e.what());
}
}
template<typename... Args>
void Verify(bool cond, unsigned int line, std::string_view file, std::string_view function, std::string message, const Args&... args)
{
using namespace std::literals;
if(cond)
return;
try
{
std::stringstream ss;
ss << Format("Verification failed: %", message, args...);
Logs::Report(LogType::FatalError, line, file, function, ss.str());
}
catch(const std::exception& e)
{
Logs::Report(LogType::FatalError, line, file, function, "formatter exception catched in the log printer: "s + e.what());
}
}
#ifdef DEBUG
template<typename... Args>
void Assert(bool cond, unsigned int line, std::string_view file, std::string_view function, std::string message, const Args&... args)
{
using namespace std::literals;
if(cond)
return;
try
{
std::stringstream ss;
ss << Format("Assertion failed: %", message, args...);
Logs::Report(LogType::FatalError, line, file, function, ss.str());
}
catch(const std::exception& e)
{
Logs::Report(LogType::FatalError, line, file, function, "formatter exception catched in the log printer: "s + e.what());
}
}
#endif
}
+40
View File
@@ -0,0 +1,40 @@
#ifndef __MLX_MEMORY__
#define __MLX_MEMORY__
namespace mlx
{
class MemManager
{
public:
MemManager();
static void* Malloc(std::size_t size);
static void* AlignedMalloc(std::size_t alignment, std::size_t size);
static void* Calloc(std::size_t n, std::size_t size);
static void* AlignedCalloc(std::size_t alignment, std::size_t n, std::size_t size);
static void* Realloc(void* ptr, std::size_t size);
static void* AlignedRealloc(void* ptr, std::size_t alignment, std::size_t size);
static void Free(void* ptr);
static inline bool IsInit() noexcept { return s_instance != nullptr; }
static inline MemManager& Get() noexcept { return *s_instance; }
~MemManager();
private:
struct Descriptor
{
void* ptr;
std::size_t size;
bool aligned;
Descriptor(void* ptr, std::size_t size, bool aligned) : ptr(ptr), size(size), aligned(aligned) {}
};
private:
static MemManager* s_instance;
inline static std::vector<Descriptor> s_blocks;
};
}
#endif
+125
View File
@@ -0,0 +1,125 @@
#ifndef __MLX_PROFILER__
#define __MLX_PROFILER__
namespace mlx
{
using FloatingPointMilliseconds = std::chrono::duration<double, std::milli>;
struct ProfileResult
{
std::string name;
FloatingPointMilliseconds elapsed_time;
std::thread::id thread_id;
};
class Profiler
{
public:
Profiler(const Profiler&) = delete;
Profiler(Profiler&&) = delete;
Profiler() { BeginRuntimeSession(); s_instance = this; }
void AppendProfileData(ProfileResult&& result);
inline static bool IsInit() noexcept { return s_instance != nullptr; }
inline static Profiler& Get() noexcept { return *s_instance; }
~Profiler();
private:
void BeginRuntimeSession();
void WriteProfile(const ProfileResult& result);
void EndRuntimeSession();
inline void WriteHeader()
{
m_output_stream << "{\"profileData\":[{}";
m_output_stream.flush();
}
inline void WriteFooter()
{
m_output_stream << "]}";
m_output_stream.flush();
}
private:
static Profiler* s_instance;
std::unordered_map<std::string, std::pair<std::size_t, ProfileResult>> m_profile_data;
std::ofstream m_output_stream;
bool m_runtime_session_began = false;
};
class ProfilerTimer
{
public:
ProfilerTimer(const char* name) : m_name(name)
{
m_start_timepoint = std::chrono::steady_clock::now();
}
inline void Stop()
{
auto end_timepoint = std::chrono::steady_clock::now();
auto high_res_start = FloatingPointMilliseconds{ m_start_timepoint.time_since_epoch() };
auto elapsed_time = std::chrono::time_point_cast<std::chrono::milliseconds>(end_timepoint).time_since_epoch() - std::chrono::time_point_cast<std::chrono::milliseconds>(m_start_timepoint).time_since_epoch();
Profiler::Get().AppendProfileData({ m_name, elapsed_time, std::this_thread::get_id() });
m_stopped = true;
}
~ProfilerTimer()
{
if(!m_stopped)
Stop();
}
private:
std::chrono::time_point<std::chrono::steady_clock> m_start_timepoint;
const char* m_name;
bool m_stopped = false;
};
namespace ProfilerUtils
{
template <std::size_t N>
struct ChangeResult
{
char data[N];
};
template <std::size_t N, std::size_t K>
constexpr auto CleanupOutputString(const char(&expr)[N], const char(&remove)[K])
{
ChangeResult<N> result = {};
std::size_t src_index = 0;
std::size_t dst_index = 0;
while(src_index < N)
{
std::size_t match_index = 0;
while(match_index < K - 1 && src_index + match_index < N - 1 && expr[src_index + match_index] == remove[match_index])
match_index++;
if(match_index == K - 1)
src_index += match_index;
result.data[dst_index++] = expr[src_index] == '"' ? '\'' : expr[src_index];
src_index++;
}
return result;
}
}
}
#ifdef PROFILER
#define MLX_PROFILE_SCOPE_LINE2(name, line) constexpr auto fixed_name_##line = ::mlx::ProfilerUtils::CleanupOutputString(name, "__cdecl ");\
::mlx::ProfilerTimer timer##line(fixed_name_##line.data)
#define MLX_PROFILE_SCOPE_LINE(name, line) MLX_PROFILE_SCOPE_LINE2(name, line)
#define MLX_PROFILE_SCOPE(name) MLX_PROFILE_SCOPE_LINE(name, __LINE__)
#define MLX_PROFILE_FUNCTION() MLX_PROFILE_SCOPE(MLX_FUNC_SIG)
#else
#define MLX_PROFILE_SCOPE(name)
#define MLX_PROFILE_FUNCTION()
#endif
#endif
+61
View File
@@ -0,0 +1,61 @@
#ifndef __MLX_SDL_MANAGER__
#define __MLX_SDL_MANAGER__
#include <mlx.h>
#include <Maths/Vec2.h>
namespace mlx
{
class SDLManager
{
public:
SDLManager();
Handle CreateWindow(const mlx_window_create_info* info, std::int32_t& id, bool hidden);
void DestroyWindow(Handle window) noexcept;
SDL_Window* GetRawWindow(Handle window) noexcept;
void InputsFetcher(std::function<void(mlx_event_type, int, int)> functor);
void SetInputBinding(std::function<void(SDL_Event*)> functor);
VkSurfaceKHR CreateVulkanSurface(Handle window, VkInstance instance) const noexcept;
Vec2ui GetVulkanDrawableSize(Handle window) const noexcept;
void MoveMouseOnWindow(Handle window, int x, int y) const noexcept;
void GetScreenSizeWindowIsOn(Handle window, int* x, int* y) const noexcept;
void SetWindowPosition(Handle window, int x, int y) const noexcept;
void SetWindowSize(Handle window, int x, int y) const noexcept;
void SetWindowTitle(Handle window, std::string_view title) const noexcept;
void SetWindowFullscreen(Handle window, bool enable) const noexcept;
void SetWindowMaxSize(Handle window, int x, int y) const noexcept;
void SetWindowMinSize(Handle window, int x, int y) const noexcept;
void MaximizeWindow(Handle window) const noexcept;
void MinimizeWindow(Handle window) const noexcept;
void RestoreWindow(Handle window) const noexcept;
void GetWindowPosition(Handle window, int* x, int* y) const noexcept;
void GetWindowSize(Handle window, int* x, int* y) const noexcept;
static void HideCursor() noexcept;
static void ShowCursor() noexcept;
std::int32_t GetX() const noexcept;
std::int32_t GetY() const noexcept;
std::int32_t GetXRel() const noexcept;
std::int32_t GetYRel() const noexcept;
inline static bool IsInit() noexcept { return s_instance != nullptr; }
inline static SDLManager& Get() noexcept { return *s_instance; }
~SDLManager();
private:
static SDLManager* s_instance;
std::function<void(SDL_Event*)> m_binding_hook;
std::unordered_set<Handle> m_windows_registry;
bool m_drop_sdl_responsability = false;
};
}
#endif
+17
View File
@@ -0,0 +1,17 @@
#ifndef __MLX_UUID__
#define __MLX_UUID__
namespace mlx
{
class UUID
{
public:
UUID();
inline operator std::uint64_t() const noexcept { return m_uuid; }
private:
std::uint64_t m_uuid;
};
}
#endif
@@ -1,20 +1,6 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* dogica_ttf.h :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2023/04/11 16:20:25 by maldavid #+# #+# */
/* Updated: 2023/12/14 16:54:12 by maldavid ### ########.fr */
/* */
/* ************************************************************************** */
#ifndef __MLX_DOGICA_TTF__
#define __MLX_DOGICA_TTF__
#include <vector>
constexpr const unsigned int dogica_ttf_len = 33860;
static const std::vector<unsigned char> dogica_ttf = {
@@ -1,20 +1,6 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* icon_mlx.h :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2023/11/25 11:23:16 by maldavid #+# #+# */
/* Updated: 2023/11/25 11:55:51 by maldavid ### ########.fr */
/* */
/* ************************************************************************** */
#ifndef __ICON_MLX__
#define __ICON_MLX__
#include <cstdint>
constexpr const int logo_mlx_height = 125;
constexpr const int logo_mlx_width = 125;
constexpr const int logo_mlx_size = logo_mlx_height * logo_mlx_width * 4;
@@ -0,0 +1,28 @@
[nzsl_version("1.0")]
module;
struct VertOut
{
[location(0)] color: vec4[f32],
[location(1)] uv: vec2[f32]
}
struct FragOut
{
[location(0)] color: vec4[f32]
}
external
{
[set(1), binding(0)] u_texture: sampler2D[f32]
}
[entry(frag)]
fn main(input: VertOut) -> FragOut
{
let output: FragOut;
output.color = input.color * u_texture.Sample(input.uv);
if(output.color.w == 0.0)
discard;
return output;
}
@@ -0,0 +1,44 @@
3,2,35,7,0,0,1,0,39,0,0,0,51,0,0,0,0,0,0,0,17,0,2,0,1,0,0,0,14,0,
3,0,0,0,0,0,1,0,0,0,15,0,8,0,4,0,0,0,28,0,0,0,109,97,105,110,0,0,0,0,
10,0,0,0,16,0,0,0,22,0,0,0,16,0,3,0,28,0,0,0,7,0,0,0,3,0,3,0,0,0,
0,0,100,0,0,0,5,0,4,0,19,0,0,0,86,101,114,116,79,117,116,0,6,0,5,0,19,0,0,0,
0,0,0,0,99,111,108,111,114,0,0,0,6,0,4,0,19,0,0,0,1,0,0,0,117,118,0,0,5,0,
4,0,23,0,0,0,70,114,97,103,79,117,116,0,6,0,5,0,23,0,0,0,0,0,0,0,99,111,108,111,
114,0,0,0,5,0,5,0,5,0,0,0,117,95,116,101,120,116,117,114,101,0,0,0,5,0,4,0,10,0,
0,0,99,111,108,111,114,0,0,0,5,0,3,0,16,0,0,0,117,118,0,0,5,0,4,0,22,0,0,0,
99,111,108,111,114,0,0,0,5,0,4,0,28,0,0,0,109,97,105,110,0,0,0,0,71,0,4,0,5,0,
0,0,33,0,0,0,0,0,0,0,71,0,4,0,5,0,0,0,34,0,0,0,1,0,0,0,71,0,4,0,
10,0,0,0,30,0,0,0,0,0,0,0,71,0,4,0,16,0,0,0,30,0,0,0,1,0,0,0,71,0,
4,0,22,0,0,0,30,0,0,0,0,0,0,0,72,0,5,0,19,0,0,0,0,0,0,0,35,0,0,0,
0,0,0,0,72,0,5,0,19,0,0,0,1,0,0,0,35,0,0,0,16,0,0,0,72,0,5,0,23,0,
0,0,0,0,0,0,35,0,0,0,0,0,0,0,22,0,3,0,1,0,0,0,32,0,0,0,25,0,9,0,
2,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,
0,0,27,0,3,0,3,0,0,0,2,0,0,0,32,0,4,0,4,0,0,0,0,0,0,0,3,0,0,0,
19,0,2,0,6,0,0,0,33,0,3,0,7,0,0,0,6,0,0,0,23,0,4,0,8,0,0,0,1,0,
0,0,4,0,0,0,32,0,4,0,9,0,0,0,1,0,0,0,8,0,0,0,21,0,4,0,11,0,0,0,
32,0,0,0,1,0,0,0,43,0,4,0,11,0,0,0,12,0,0,0,0,0,0,0,32,0,4,0,13,0,
0,0,7,0,0,0,8,0,0,0,23,0,4,0,14,0,0,0,1,0,0,0,2,0,0,0,32,0,4,0,
15,0,0,0,1,0,0,0,14,0,0,0,43,0,4,0,11,0,0,0,17,0,0,0,1,0,0,0,32,0,
4,0,18,0,0,0,7,0,0,0,14,0,0,0,30,0,4,0,19,0,0,0,8,0,0,0,14,0,0,0,
32,0,4,0,20,0,0,0,7,0,0,0,19,0,0,0,32,0,4,0,21,0,0,0,3,0,0,0,8,0,
0,0,30,0,3,0,23,0,0,0,8,0,0,0,32,0,4,0,24,0,0,0,7,0,0,0,23,0,0,0,
43,0,4,0,11,0,0,0,25,0,0,0,3,0,0,0,43,0,4,0,1,0,0,0,26,0,0,0,0,0,
0,0,20,0,2,0,27,0,0,0,59,0,4,0,4,0,0,0,5,0,0,0,0,0,0,0,59,0,4,0,
9,0,0,0,10,0,0,0,1,0,0,0,59,0,4,0,15,0,0,0,16,0,0,0,1,0,0,0,59,0,
4,0,21,0,0,0,22,0,0,0,3,0,0,0,54,0,5,0,6,0,0,0,28,0,0,0,0,0,0,0,
7,0,0,0,248,0,2,0,29,0,0,0,59,0,4,0,24,0,0,0,30,0,0,0,7,0,0,0,59,0,
4,0,20,0,0,0,31,0,0,0,7,0,0,0,65,0,5,0,13,0,0,0,32,0,0,0,31,0,0,0,
12,0,0,0,63,0,3,0,32,0,0,0,10,0,0,0,65,0,5,0,18,0,0,0,33,0,0,0,31,0,
0,0,17,0,0,0,63,0,3,0,33,0,0,0,16,0,0,0,65,0,5,0,13,0,0,0,34,0,0,0,
31,0,0,0,12,0,0,0,61,0,4,0,8,0,0,0,35,0,0,0,34,0,0,0,61,0,4,0,3,0,
0,0,36,0,0,0,5,0,0,0,65,0,5,0,18,0,0,0,37,0,0,0,31,0,0,0,17,0,0,0,
61,0,4,0,14,0,0,0,38,0,0,0,37,0,0,0,87,0,5,0,8,0,0,0,39,0,0,0,36,0,
0,0,38,0,0,0,133,0,5,0,8,0,0,0,40,0,0,0,35,0,0,0,39,0,0,0,65,0,5,0,
13,0,0,0,41,0,0,0,30,0,0,0,12,0,0,0,62,0,3,0,41,0,0,0,40,0,0,0,65,0,
5,0,13,0,0,0,45,0,0,0,30,0,0,0,12,0,0,0,61,0,4,0,8,0,0,0,46,0,0,0,
45,0,0,0,81,0,5,0,1,0,0,0,47,0,0,0,46,0,0,0,3,0,0,0,180,0,5,0,27,0,
0,0,48,0,0,0,47,0,0,0,26,0,0,0,247,0,3,0,42,0,0,0,0,0,0,0,250,0,4,0,
48,0,0,0,43,0,0,0,44,0,0,0,248,0,2,0,43,0,0,0,252,0,1,0,248,0,2,0,44,0,
0,0,249,0,2,0,42,0,0,0,248,0,2,0,42,0,0,0,61,0,4,0,23,0,0,0,49,0,0,0,
30,0,0,0,81,0,5,0,8,0,0,0,50,0,0,0,49,0,0,0,0,0,0,0,62,0,3,0,22,0,
0,0,50,0,0,0,253,0,1,0,56,0,1,0
@@ -0,0 +1,44 @@
[nzsl_version("1.0")]
module;
struct VertIn
{
[location(0)] pos: vec4[f32],
[location(1)] uv: vec2[f32]
}
struct VertOut
{
[location(0)] color: vec4[f32],
[location(1)] uv: vec2[f32],
[builtin(position)] pos: vec4[f32]
}
struct ViewerData
{
projection_matrix: mat4[f32]
}
struct SpriteData
{
model_matrix: mat4[f32],
color: vec4[f32]
}
external
{
[set(0), binding(0)] viewer_data: uniform[ViewerData],
model: push_constant[SpriteData]
}
[entry(vert)]
fn main(input: VertIn) -> VertOut
{
let position: vec4[f32] = vec4[f32](input.pos.xy, 0.0, 1.0);
input.uv *= -1.0;
let output: VertOut;
output.uv = input.uv;
output.color = model.color;
output.pos = viewer_data.projection_matrix * model.model_matrix * position;
return output;
}
@@ -0,0 +1,72 @@
3,2,35,7,0,0,1,0,39,0,0,0,71,0,0,0,0,0,0,0,17,0,2,0,1,0,0,0,14,0,
3,0,0,0,0,0,1,0,0,0,15,0,10,0,0,0,0,0,35,0,0,0,109,97,105,110,0,0,0,0,
13,0,0,0,19,0,0,0,25,0,0,0,27,0,0,0,28,0,0,0,3,0,3,0,0,0,0,0,100,0,
0,0,5,0,5,0,4,0,0,0,86,105,101,119,101,114,68,97,116,97,0,0,6,0,8,0,4,0,0,0,
0,0,0,0,112,114,111,106,101,99,116,105,111,110,95,109,97,116,114,105,120,0,0,0,5,0,5,0,7,0,
0,0,83,112,114,105,116,101,68,97,116,97,0,0,6,0,7,0,7,0,0,0,0,0,0,0,109,111,100,101,
108,95,109,97,116,114,105,120,0,0,0,0,6,0,5,0,7,0,0,0,1,0,0,0,99,111,108,111,114,0,
0,0,5,0,4,0,22,0,0,0,86,101,114,116,73,110,0,0,6,0,4,0,22,0,0,0,0,0,0,0,
112,111,115,0,6,0,4,0,22,0,0,0,1,0,0,0,117,118,0,0,5,0,4,0,29,0,0,0,86,101,
114,116,79,117,116,0,6,0,5,0,29,0,0,0,0,0,0,0,99,111,108,111,114,0,0,0,6,0,4,0,
29,0,0,0,1,0,0,0,117,118,0,0,6,0,4,0,29,0,0,0,2,0,0,0,112,111,115,0,5,0,
5,0,6,0,0,0,118,105,101,119,101,114,95,100,97,116,97,0,5,0,4,0,9,0,0,0,109,111,100,101,
108,0,0,0,5,0,3,0,13,0,0,0,112,111,115,0,5,0,3,0,19,0,0,0,117,118,0,0,5,0,
4,0,25,0,0,0,99,111,108,111,114,0,0,0,5,0,3,0,27,0,0,0,117,118,0,0,5,0,5,0,
28,0,0,0,112,111,115,105,116,105,111,110,0,0,0,0,5,0,4,0,35,0,0,0,109,97,105,110,0,0,
0,0,71,0,4,0,6,0,0,0,33,0,0,0,0,0,0,0,71,0,4,0,6,0,0,0,34,0,0,0,
0,0,0,0,71,0,4,0,28,0,0,0,11,0,0,0,0,0,0,0,71,0,4,0,13,0,0,0,30,0,
0,0,0,0,0,0,71,0,4,0,19,0,0,0,30,0,0,0,1,0,0,0,71,0,4,0,25,0,0,0,
30,0,0,0,0,0,0,0,71,0,4,0,27,0,0,0,30,0,0,0,1,0,0,0,71,0,3,0,4,0,
0,0,2,0,0,0,72,0,4,0,4,0,0,0,0,0,0,0,5,0,0,0,72,0,5,0,4,0,0,0,
0,0,0,0,7,0,0,0,16,0,0,0,72,0,5,0,4,0,0,0,0,0,0,0,35,0,0,0,0,0,
0,0,71,0,3,0,7,0,0,0,2,0,0,0,72,0,4,0,7,0,0,0,0,0,0,0,5,0,0,0,
72,0,5,0,7,0,0,0,0,0,0,0,7,0,0,0,16,0,0,0,72,0,5,0,7,0,0,0,0,0,
0,0,35,0,0,0,0,0,0,0,72,0,5,0,7,0,0,0,1,0,0,0,35,0,0,0,64,0,0,0,
72,0,5,0,22,0,0,0,0,0,0,0,35,0,0,0,0,0,0,0,72,0,5,0,22,0,0,0,1,0,
0,0,35,0,0,0,16,0,0,0,72,0,5,0,29,0,0,0,0,0,0,0,35,0,0,0,0,0,0,0,
72,0,5,0,29,0,0,0,1,0,0,0,35,0,0,0,16,0,0,0,72,0,5,0,29,0,0,0,2,0,
0,0,35,0,0,0,32,0,0,0,22,0,3,0,1,0,0,0,32,0,0,0,23,0,4,0,2,0,0,0,
1,0,0,0,4,0,0,0,24,0,4,0,3,0,0,0,2,0,0,0,4,0,0,0,30,0,3,0,4,0,
0,0,3,0,0,0,32,0,4,0,5,0,0,0,2,0,0,0,4,0,0,0,30,0,4,0,7,0,0,0,
3,0,0,0,2,0,0,0,32,0,4,0,8,0,0,0,9,0,0,0,7,0,0,0,19,0,2,0,10,0,
0,0,33,0,3,0,11,0,0,0,10,0,0,0,32,0,4,0,12,0,0,0,1,0,0,0,2,0,0,0,
21,0,4,0,14,0,0,0,32,0,0,0,1,0,0,0,43,0,4,0,14,0,0,0,15,0,0,0,0,0,
0,0,32,0,4,0,16,0,0,0,7,0,0,0,2,0,0,0,23,0,4,0,17,0,0,0,1,0,0,0,
2,0,0,0,32,0,4,0,18,0,0,0,1,0,0,0,17,0,0,0,43,0,4,0,14,0,0,0,20,0,
0,0,1,0,0,0,32,0,4,0,21,0,0,0,7,0,0,0,17,0,0,0,30,0,4,0,22,0,0,0,
2,0,0,0,17,0,0,0,32,0,4,0,23,0,0,0,7,0,0,0,22,0,0,0,32,0,4,0,24,0,
0,0,3,0,0,0,2,0,0,0,32,0,4,0,26,0,0,0,3,0,0,0,17,0,0,0,30,0,5,0,
29,0,0,0,2,0,0,0,17,0,0,0,2,0,0,0,43,0,4,0,1,0,0,0,30,0,0,0,0,0,
0,0,43,0,4,0,1,0,0,0,31,0,0,0,0,0,128,63,43,0,4,0,1,0,0,0,32,0,0,0,
0,0,128,191,32,0,4,0,33,0,0,0,7,0,0,0,29,0,0,0,43,0,4,0,14,0,0,0,34,0,
0,0,2,0,0,0,32,0,4,0,53,0,0,0,9,0,0,0,2,0,0,0,32,0,4,0,57,0,0,0,
2,0,0,0,3,0,0,0,32,0,4,0,60,0,0,0,9,0,0,0,3,0,0,0,59,0,4,0,5,0,
0,0,6,0,0,0,2,0,0,0,59,0,4,0,8,0,0,0,9,0,0,0,9,0,0,0,59,0,4,0,
12,0,0,0,13,0,0,0,1,0,0,0,59,0,4,0,18,0,0,0,19,0,0,0,1,0,0,0,59,0,
4,0,24,0,0,0,25,0,0,0,3,0,0,0,59,0,4,0,26,0,0,0,27,0,0,0,3,0,0,0,
59,0,4,0,24,0,0,0,28,0,0,0,3,0,0,0,54,0,5,0,10,0,0,0,35,0,0,0,0,0,
0,0,11,0,0,0,248,0,2,0,36,0,0,0,59,0,4,0,16,0,0,0,37,0,0,0,7,0,0,0,
59,0,4,0,33,0,0,0,38,0,0,0,7,0,0,0,59,0,4,0,23,0,0,0,39,0,0,0,7,0,
0,0,65,0,5,0,16,0,0,0,40,0,0,0,39,0,0,0,15,0,0,0,63,0,3,0,40,0,0,0,
13,0,0,0,65,0,5,0,21,0,0,0,41,0,0,0,39,0,0,0,20,0,0,0,63,0,3,0,41,0,
0,0,19,0,0,0,65,0,5,0,16,0,0,0,42,0,0,0,39,0,0,0,15,0,0,0,61,0,4,0,
2,0,0,0,43,0,0,0,42,0,0,0,79,0,7,0,17,0,0,0,44,0,0,0,43,0,0,0,43,0,
0,0,0,0,0,0,1,0,0,0,80,0,6,0,2,0,0,0,45,0,0,0,44,0,0,0,30,0,0,0,
31,0,0,0,62,0,3,0,37,0,0,0,45,0,0,0,65,0,5,0,21,0,0,0,46,0,0,0,39,0,
0,0,20,0,0,0,61,0,4,0,17,0,0,0,47,0,0,0,46,0,0,0,142,0,5,0,17,0,0,0,
48,0,0,0,47,0,0,0,32,0,0,0,65,0,5,0,21,0,0,0,49,0,0,0,39,0,0,0,20,0,
0,0,62,0,3,0,49,0,0,0,48,0,0,0,65,0,5,0,21,0,0,0,50,0,0,0,39,0,0,0,
20,0,0,0,61,0,4,0,17,0,0,0,51,0,0,0,50,0,0,0,65,0,5,0,21,0,0,0,52,0,
0,0,38,0,0,0,20,0,0,0,62,0,3,0,52,0,0,0,51,0,0,0,65,0,5,0,53,0,0,0,
54,0,0,0,9,0,0,0,20,0,0,0,61,0,4,0,2,0,0,0,55,0,0,0,54,0,0,0,65,0,
5,0,16,0,0,0,56,0,0,0,38,0,0,0,15,0,0,0,62,0,3,0,56,0,0,0,55,0,0,0,
65,0,5,0,57,0,0,0,58,0,0,0,6,0,0,0,15,0,0,0,61,0,4,0,3,0,0,0,59,0,
0,0,58,0,0,0,65,0,5,0,60,0,0,0,61,0,0,0,9,0,0,0,15,0,0,0,61,0,4,0,
3,0,0,0,62,0,0,0,61,0,0,0,146,0,5,0,3,0,0,0,63,0,0,0,59,0,0,0,62,0,
0,0,61,0,4,0,2,0,0,0,64,0,0,0,37,0,0,0,145,0,5,0,2,0,0,0,65,0,0,0,
63,0,0,0,64,0,0,0,65,0,5,0,16,0,0,0,66,0,0,0,38,0,0,0,34,0,0,0,62,0,
3,0,66,0,0,0,65,0,0,0,61,0,4,0,29,0,0,0,67,0,0,0,38,0,0,0,81,0,5,0,
2,0,0,0,68,0,0,0,67,0,0,0,0,0,0,0,62,0,3,0,25,0,0,0,68,0,0,0,81,0,
5,0,17,0,0,0,69,0,0,0,67,0,0,0,1,0,0,0,62,0,3,0,27,0,0,0,69,0,0,0,
81,0,5,0,2,0,0,0,70,0,0,0,67,0,0,0,2,0,0,0,62,0,3,0,28,0,0,0,70,0,
0,0,253,0,1,0,56,0,1,0
@@ -0,0 +1,46 @@
[nzsl_version("1.0")]
module;
struct VertOut
{
[location(0)] uv : vec2[f32]
}
struct FragOut
{
[location(0)] color: vec4[f32]
}
external
{
[set(0), binding(0)] u_texture: sampler2D[f32]
}
option approximates_rgb: bool = false;
fn LinearTosRGB(color: vec3[f32]) -> vec3[f32]
{
const if(!approximates_rgb)
{
return select(
color > (0.0031308).rrr,
1.055 * pow(color, (1.0 / 2.4).rrr) - (0.055).rrr,
12.92 * color
);
}
else
return pow(color, (1.0 / 2.2).rrr);
}
option gamma_correction: bool = false;
[entry(frag)]
fn main(input: VertOut) -> FragOut
{
let output: FragOut;
const if(gamma_correction)
output.color = vec4[f32](LinearTosRGB(u_texture.Sample(input.uv).xyz), 1.0);
else
output.color = u_texture.Sample(input.uv);
return output;
}
@@ -0,0 +1,31 @@
3,2,35,7,0,0,1,0,39,0,0,0,34,0,0,0,0,0,0,0,17,0,2,0,1,0,0,0,14,0,
3,0,0,0,0,0,1,0,0,0,15,0,7,0,4,0,0,0,21,0,0,0,109,97,105,110,0,0,0,0,
10,0,0,0,18,0,0,0,16,0,3,0,21,0,0,0,7,0,0,0,3,0,3,0,0,0,0,0,100,0,
0,0,5,0,4,0,14,0,0,0,86,101,114,116,79,117,116,0,6,0,4,0,14,0,0,0,0,0,0,0,
117,118,0,0,5,0,4,0,19,0,0,0,70,114,97,103,79,117,116,0,6,0,5,0,19,0,0,0,0,0,
0,0,99,111,108,111,114,0,0,0,5,0,5,0,5,0,0,0,117,95,116,101,120,116,117,114,101,0,0,0,
5,0,3,0,10,0,0,0,117,118,0,0,5,0,4,0,18,0,0,0,99,111,108,111,114,0,0,0,5,0,
4,0,21,0,0,0,109,97,105,110,0,0,0,0,71,0,4,0,5,0,0,0,33,0,0,0,0,0,0,0,
71,0,4,0,5,0,0,0,34,0,0,0,0,0,0,0,71,0,4,0,10,0,0,0,30,0,0,0,0,0,
0,0,71,0,4,0,18,0,0,0,30,0,0,0,0,0,0,0,72,0,5,0,14,0,0,0,0,0,0,0,
35,0,0,0,0,0,0,0,72,0,5,0,19,0,0,0,0,0,0,0,35,0,0,0,0,0,0,0,22,0,
3,0,1,0,0,0,32,0,0,0,25,0,9,0,2,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,27,0,3,0,3,0,0,0,2,0,0,0,32,0,
4,0,4,0,0,0,0,0,0,0,3,0,0,0,19,0,2,0,6,0,0,0,33,0,3,0,7,0,0,0,
6,0,0,0,23,0,4,0,8,0,0,0,1,0,0,0,2,0,0,0,32,0,4,0,9,0,0,0,1,0,
0,0,8,0,0,0,21,0,4,0,11,0,0,0,32,0,0,0,1,0,0,0,43,0,4,0,11,0,0,0,
12,0,0,0,0,0,0,0,32,0,4,0,13,0,0,0,7,0,0,0,8,0,0,0,30,0,3,0,14,0,
0,0,8,0,0,0,32,0,4,0,15,0,0,0,7,0,0,0,14,0,0,0,23,0,4,0,16,0,0,0,
1,0,0,0,4,0,0,0,32,0,4,0,17,0,0,0,3,0,0,0,16,0,0,0,30,0,3,0,19,0,
0,0,16,0,0,0,32,0,4,0,20,0,0,0,7,0,0,0,19,0,0,0,32,0,4,0,31,0,0,0,
7,0,0,0,16,0,0,0,59,0,4,0,4,0,0,0,5,0,0,0,0,0,0,0,59,0,4,0,9,0,
0,0,10,0,0,0,1,0,0,0,59,0,4,0,17,0,0,0,18,0,0,0,3,0,0,0,54,0,5,0,
6,0,0,0,21,0,0,0,0,0,0,0,7,0,0,0,248,0,2,0,22,0,0,0,59,0,4,0,20,0,
0,0,23,0,0,0,7,0,0,0,59,0,4,0,15,0,0,0,24,0,0,0,7,0,0,0,65,0,5,0,
13,0,0,0,25,0,0,0,24,0,0,0,12,0,0,0,63,0,3,0,25,0,0,0,10,0,0,0,61,0,
4,0,3,0,0,0,26,0,0,0,5,0,0,0,65,0,5,0,13,0,0,0,27,0,0,0,24,0,0,0,
12,0,0,0,61,0,4,0,8,0,0,0,28,0,0,0,27,0,0,0,87,0,5,0,16,0,0,0,29,0,
0,0,26,0,0,0,28,0,0,0,65,0,5,0,31,0,0,0,30,0,0,0,23,0,0,0,12,0,0,0,
62,0,3,0,30,0,0,0,29,0,0,0,61,0,4,0,19,0,0,0,32,0,0,0,23,0,0,0,81,0,
5,0,16,0,0,0,33,0,0,0,32,0,0,0,0,0,0,0,62,0,3,0,18,0,0,0,33,0,0,0,
253,0,1,0,56,0,1,0
@@ -0,0 +1,31 @@
[nzsl_version("1.0")]
module;
struct VertIn
{
[builtin(vertex_index)] vert_index: i32
}
struct VertOut
{
[location(0)] uv: vec2[f32],
[builtin(position)] position: vec4[f32]
}
const vertices = array[vec2[f32]](
vec2[f32](-1.0, -3.0),
vec2[f32](-1.0, 1.0),
vec2[f32]( 3.0, 1.0)
);
[entry(vert)]
fn main(input: VertIn) -> VertOut
{
let position = vertices[input.vert_index];
let output: VertOut;
output.position = vec4[f32](position, 0.0, 1.0);
output.uv = position * 0.5 + vec2[f32](0.5, 0.5);
return output;
}
@@ -0,0 +1,48 @@
3,2,35,7,0,0,1,0,39,0,0,0,59,0,0,0,0,0,0,0,17,0,2,0,1,0,0,0,14,0,
3,0,0,0,0,0,1,0,0,0,15,0,8,0,0,0,0,0,37,0,0,0,109,97,105,110,0,0,0,0,
20,0,0,0,26,0,0,0,29,0,0,0,3,0,3,0,0,0,0,0,100,0,0,0,5,0,4,0,23,0,
0,0,86,101,114,116,73,110,0,0,6,0,6,0,23,0,0,0,0,0,0,0,118,101,114,116,95,105,110,100,
101,120,0,0,5,0,4,0,30,0,0,0,86,101,114,116,79,117,116,0,6,0,4,0,30,0,0,0,0,0,
0,0,117,118,0,0,6,0,6,0,30,0,0,0,1,0,0,0,112,111,115,105,116,105,111,110,0,0,0,0,
5,0,5,0,15,0,0,0,118,101,114,116,105,99,101,115,0,0,0,0,5,0,6,0,20,0,0,0,118,101,
114,116,101,120,95,105,110,100,101,120,0,0,0,0,5,0,3,0,26,0,0,0,117,118,0,0,5,0,5,0,
29,0,0,0,112,111,115,105,116,105,111,110,0,0,0,0,5,0,4,0,37,0,0,0,109,97,105,110,0,0,
0,0,71,0,4,0,20,0,0,0,11,0,0,0,42,0,0,0,71,0,4,0,29,0,0,0,11,0,0,0,
0,0,0,0,71,0,4,0,26,0,0,0,30,0,0,0,0,0,0,0,72,0,5,0,23,0,0,0,0,0,
0,0,35,0,0,0,0,0,0,0,72,0,5,0,30,0,0,0,0,0,0,0,35,0,0,0,0,0,0,0,
72,0,5,0,30,0,0,0,1,0,0,0,35,0,0,0,16,0,0,0,22,0,3,0,1,0,0,0,32,0,
0,0,23,0,4,0,2,0,0,0,1,0,0,0,2,0,0,0,21,0,4,0,3,0,0,0,32,0,0,0,
0,0,0,0,43,0,4,0,3,0,0,0,4,0,0,0,3,0,0,0,28,0,4,0,5,0,0,0,2,0,
0,0,4,0,0,0,32,0,4,0,6,0,0,0,6,0,0,0,5,0,0,0,43,0,4,0,1,0,0,0,
7,0,0,0,0,0,128,191,43,0,4,0,1,0,0,0,8,0,0,0,0,0,64,192,44,0,5,0,2,0,
0,0,9,0,0,0,7,0,0,0,8,0,0,0,43,0,4,0,1,0,0,0,10,0,0,0,0,0,128,63,
44,0,5,0,2,0,0,0,11,0,0,0,7,0,0,0,10,0,0,0,43,0,4,0,1,0,0,0,12,0,
0,0,0,0,64,64,44,0,5,0,2,0,0,0,13,0,0,0,12,0,0,0,10,0,0,0,44,0,6,0,
5,0,0,0,14,0,0,0,9,0,0,0,11,0,0,0,13,0,0,0,19,0,2,0,16,0,0,0,33,0,
3,0,17,0,0,0,16,0,0,0,21,0,4,0,18,0,0,0,32,0,0,0,1,0,0,0,32,0,4,0,
19,0,0,0,1,0,0,0,18,0,0,0,43,0,4,0,18,0,0,0,21,0,0,0,0,0,0,0,32,0,
4,0,22,0,0,0,7,0,0,0,18,0,0,0,30,0,3,0,23,0,0,0,18,0,0,0,32,0,4,0,
24,0,0,0,7,0,0,0,23,0,0,0,32,0,4,0,25,0,0,0,3,0,0,0,2,0,0,0,23,0,
4,0,27,0,0,0,1,0,0,0,4,0,0,0,32,0,4,0,28,0,0,0,3,0,0,0,27,0,0,0,
30,0,4,0,30,0,0,0,2,0,0,0,27,0,0,0,32,0,4,0,31,0,0,0,7,0,0,0,2,0,
0,0,32,0,4,0,32,0,0,0,7,0,0,0,30,0,0,0,43,0,4,0,18,0,0,0,33,0,0,0,
1,0,0,0,43,0,4,0,1,0,0,0,34,0,0,0,0,0,0,0,43,0,4,0,1,0,0,0,35,0,
0,0,0,0,0,63,44,0,5,0,2,0,0,0,36,0,0,0,35,0,0,0,35,0,0,0,32,0,4,0,
45,0,0,0,6,0,0,0,2,0,0,0,32,0,4,0,51,0,0,0,7,0,0,0,27,0,0,0,59,0,
5,0,6,0,0,0,15,0,0,0,6,0,0,0,14,0,0,0,59,0,4,0,19,0,0,0,20,0,0,0,
1,0,0,0,59,0,4,0,25,0,0,0,26,0,0,0,3,0,0,0,59,0,4,0,28,0,0,0,29,0,
0,0,3,0,0,0,54,0,5,0,16,0,0,0,37,0,0,0,0,0,0,0,17,0,0,0,248,0,2,0,
38,0,0,0,59,0,4,0,31,0,0,0,39,0,0,0,7,0,0,0,59,0,4,0,32,0,0,0,40,0,
0,0,7,0,0,0,59,0,4,0,24,0,0,0,41,0,0,0,7,0,0,0,65,0,5,0,22,0,0,0,
42,0,0,0,41,0,0,0,21,0,0,0,63,0,3,0,42,0,0,0,20,0,0,0,65,0,5,0,22,0,
0,0,43,0,0,0,41,0,0,0,21,0,0,0,61,0,4,0,18,0,0,0,44,0,0,0,43,0,0,0,
65,0,5,0,45,0,0,0,46,0,0,0,15,0,0,0,44,0,0,0,61,0,4,0,2,0,0,0,47,0,
0,0,46,0,0,0,62,0,3,0,39,0,0,0,47,0,0,0,61,0,4,0,2,0,0,0,48,0,0,0,
39,0,0,0,80,0,6,0,27,0,0,0,49,0,0,0,48,0,0,0,34,0,0,0,10,0,0,0,65,0,
5,0,51,0,0,0,50,0,0,0,40,0,0,0,33,0,0,0,62,0,3,0,50,0,0,0,49,0,0,0,
61,0,4,0,2,0,0,0,52,0,0,0,39,0,0,0,142,0,5,0,2,0,0,0,53,0,0,0,52,0,
0,0,35,0,0,0,129,0,5,0,2,0,0,0,54,0,0,0,53,0,0,0,36,0,0,0,65,0,5,0,
31,0,0,0,55,0,0,0,40,0,0,0,21,0,0,0,62,0,3,0,55,0,0,0,54,0,0,0,61,0,
4,0,30,0,0,0,56,0,0,0,40,0,0,0,81,0,5,0,2,0,0,0,57,0,0,0,56,0,0,0,
0,0,0,0,62,0,3,0,26,0,0,0,57,0,0,0,81,0,5,0,27,0,0,0,58,0,0,0,56,0,
0,0,1,0,0,0,62,0,3,0,29,0,0,0,58,0,0,0,253,0,1,0,56,0,1,0
+58
View File
@@ -0,0 +1,58 @@
#ifndef __MLX_DRAWABLE__
#define __MLX_DRAWABLE__
#include <Graphics/Enums.h>
#include <Maths/Quaternions.h>
#include <Maths/EulerAngles.h>
namespace mlx
{
class Drawable
{
friend class Render2DPass;
public:
inline Drawable(DrawableType type) : m_type(type) {}
inline void SetColor(Vec4f color) noexcept { m_color = std::move(color); }
inline void SetPosition(Vec2f position) noexcept { m_position = std::move(position); }
inline void SetScale(Vec2f scale) noexcept { m_scale = std::move(scale); }
inline void SetRotation(float rotation) noexcept { m_rotation = EulerAnglesf{ 0.0f, 0.0f, rotation }; }
inline void SetCenter(Vec2f center) noexcept { m_center = std::move(center); }
inline virtual void Update([[maybe_unused]] VkCommandBuffer cmd) {}
[[nodiscard]] MLX_FORCEINLINE const Vec4f& GetColor() const noexcept { return m_color; }
[[nodiscard]] MLX_FORCEINLINE const Vec2f& GetPosition() const noexcept { return m_position; }
[[nodiscard]] MLX_FORCEINLINE const Vec2f& GetScale() const noexcept { return m_scale; }
[[nodiscard]] MLX_FORCEINLINE const Quatf& GetRotation() const noexcept { return m_rotation; }
[[nodiscard]] MLX_FORCEINLINE const Vec2f& GetCenter() const noexcept { return m_center; }
[[nodiscard]] MLX_FORCEINLINE std::shared_ptr<Mesh> GetMesh() const { return p_mesh; }
[[nodiscard]] MLX_FORCEINLINE DrawableType GetType() const noexcept { return m_type; }
inline virtual ~Drawable() { if(p_set) p_set->ReturnDescriptorSetToPool(); }
protected:
[[nodiscard]] inline bool IsSetInit() const noexcept { return p_set && p_set->IsInit(); }
[[nodiscard]] inline VkDescriptorSet GetSet(std::size_t frame_index) const noexcept { return p_set ? p_set->GetSet(frame_index) : VK_NULL_HANDLE; }
inline void UpdateDescriptorSet(std::shared_ptr<DescriptorSet> set)
{
p_set = RenderCore::Get().GetDescriptorPoolManager().GetAvailablePool(set->GetShaderLayout(), set->GetShaderType()).RequestDescriptorSet(set->GetShaderLayout(), set->GetShaderType());
}
virtual void Bind(std::size_t frame_index, VkCommandBuffer cmd) = 0;
protected:
std::shared_ptr<DescriptorSet> p_set;
std::shared_ptr<Mesh> p_mesh;
Quatf m_rotation = Quatf::Identity();
Vec4f m_color = Vec4f{ 1.0f, 1.0f, 1.0f, 1.0f };
Vec2f m_position = Vec2f{ 0.0f, 0.0f };
Vec2f m_scale = Vec2f{ 1.0f, 1.0f };
Vec2f m_center = Vec2f{ 0.0f, 0.0f };
DrawableType m_type;
};
}
#endif
+13
View File
@@ -0,0 +1,13 @@
#ifndef __MLX_GRAPHICS_ENUMS__
#define __MLX_GRAPHICS_ENUMS__
namespace mlx
{
enum class DrawableType
{
Sprite,
Text
};
}
#endif
+53
View File
@@ -0,0 +1,53 @@
#ifndef __MLX_FONT__
#define __MLX_FONT__
#include <Renderer/Image.h>
namespace mlx
{
class Font
{
public:
Font(const std::filesystem::path& path, float scale) : m_build_data(path), m_name(path.string()), m_scale(scale) {}
Font(const std::string& name, const std::vector<std::uint8_t>& ttf_data, float scale) : m_build_data(ttf_data), m_name(name), m_scale(scale) {}
void BuildFont();
void Destroy();
inline const std::string& GetName() const { return m_name; }
inline float GetScale() const noexcept { return m_scale; }
inline const std::array<stbtt_packedchar, 96>& GetCharData() const { return m_cdata; }
inline const Texture& GetTexture() const noexcept { return m_atlas; }
inline bool operator==(const Font& rhs) const { return rhs.m_name == m_name && rhs.m_scale == m_scale; }
inline bool operator!=(const Font& rhs) const { return rhs.m_name != m_name || rhs.m_scale != m_scale; }
inline ~Font() { Destroy(); }
private:
std::array<stbtt_packedchar, 96> m_cdata;
Texture m_atlas;
std::variant<std::filesystem::path, std::vector<std::uint8_t>> m_build_data;
std::string m_name;
float m_scale;
};
class FontRegistry
{
public:
FontRegistry() = default;
inline void RegisterFont(std::shared_ptr<Font> font);
inline void UnregisterFont(std::shared_ptr<Font> font);
inline std::shared_ptr<Font> GetFont(const std::filesystem::path& name, float scale);
inline void Reset();
~FontRegistry() = default;
private:
std::unordered_set<std::shared_ptr<Font>> m_fonts_registry;
};
}
#include <Graphics/Font.inl>
#endif
+31
View File
@@ -0,0 +1,31 @@
#pragma once
#include <Graphics/Font.h>
namespace mlx
{
void FontRegistry::RegisterFont(std::shared_ptr<Font> font)
{
m_fonts_registry.insert(font);
}
void FontRegistry::UnregisterFont(std::shared_ptr<Font> font)
{
m_fonts_registry.erase(font);
}
std::shared_ptr<Font> FontRegistry::GetFont(const std::filesystem::path& name, float scale)
{
auto it = std::find_if(m_fonts_registry.begin(), m_fonts_registry.end(), [&name, scale](std::shared_ptr<Font> rhs)
{
return (name == rhs->GetName() && scale == rhs->GetScale());
});
return (it != m_fonts_registry.end() ? *it : nullptr);
}
void FontRegistry::Reset()
{
for(auto& font: m_fonts_registry)
font->Destroy();
m_fonts_registry.clear();
}
}
+68
View File
@@ -0,0 +1,68 @@
#ifndef __MLX_RENDERER_MESH__
#define __MLX_RENDERER_MESH__
#include <Renderer/Vertex.h>
#include <Renderer/Buffer.h>
#include <Utils/Buffer.h>
namespace mlx
{
class Mesh
{
public:
struct SubMesh
{
struct NoBuild {};
VertexBuffer vbo;
IndexBuffer ibo;
std::vector<Vertex> vertex_data;
std::vector<std::uint32_t> index_data;
std::size_t triangle_count = 0;
inline SubMesh(const std::vector<Vertex>& vertices, const std::vector<std::uint32_t>& indices);
inline SubMesh(const std::vector<Vertex>& vertices, const std::vector<std::uint32_t>& indices, NoBuild);
};
public:
Mesh() = default;
void Draw(VkCommandBuffer cmd, std::size_t& drawcalls, std::size_t& polygondrawn) const noexcept;
void Draw(VkCommandBuffer cmd, std::size_t& drawcalls, std::size_t& polygondrawn, std::size_t submesh_index) const noexcept;
inline std::size_t GetSubMeshCount() const { return m_sub_meshes.size(); }
inline void AddSubMesh(SubMesh mesh) { m_sub_meshes.emplace_back(std::move(mesh)); }
[[nodiscard]] inline SubMesh& GetSubMesh(std::size_t index) { return m_sub_meshes.at(index); }
~Mesh();
private:
std::vector<SubMesh> m_sub_meshes;
};
// A registry just to avoid destroying meshes when clearing a window
class MeshRegistry
{
public:
inline MeshRegistry();
inline void RegisterMesh(std::shared_ptr<Mesh> mesh);
inline std::shared_ptr<Mesh> FindMesh(const std::vector<Mesh::SubMesh>& sub_meshes);
inline void UnregisterMesh(std::shared_ptr<Mesh> mesh);
inline void Reset();
inline static bool IsInit() noexcept { return s_instance != nullptr; }
inline static MeshRegistry& Get() noexcept { return *s_instance; }
inline ~MeshRegistry();
private:
inline static MeshRegistry* s_instance = nullptr;
std::unordered_set<std::shared_ptr<Mesh>> m_meshes_registry;
};
}
#include <Graphics/Mesh.inl>
#endif
+77
View File
@@ -0,0 +1,77 @@
#pragma once
#include <Graphics/Mesh.h>
namespace mlx
{
Mesh::SubMesh::SubMesh(const std::vector<Vertex>& vertices, const std::vector<std::uint32_t>& indices) : vertex_data(vertices), index_data(indices)
{
CPUBuffer vb(vertices.size() * sizeof(Vertex));
std::memcpy(vb.GetData(), vertices.data(), vb.GetSize());
vbo.Init(vb.GetSize(), 0, "mlx_mesh");
vbo.SetData(std::move(vb));
CPUBuffer ib(indices.size() * sizeof(std::uint32_t));
std::memcpy(ib.GetData(), indices.data(), ib.GetSize());
ibo.Init(ib.GetSize(), 0, "mlx_mesh");
ibo.SetData(std::move(ib));
triangle_count = vertices.size() / 3;
}
Mesh::SubMesh::SubMesh(const std::vector<Vertex>& vertices, const std::vector<std::uint32_t>& indices, NoBuild) : vertex_data(vertices), index_data(indices) {}
MeshRegistry::MeshRegistry()
{
s_instance = this;
}
void MeshRegistry::RegisterMesh(std::shared_ptr<Mesh> mesh)
{
m_meshes_registry.insert(mesh);
}
std::shared_ptr<Mesh> MeshRegistry::FindMesh(const std::vector<Mesh::SubMesh>& sub_meshes)
{
for(const std::shared_ptr<Mesh>& mesh : m_meshes_registry)
{
if(mesh->GetSubMeshCount() != sub_meshes.size()) // If the number of submeshes is different than the one we want to find no need to test
continue;
bool found = true;
for(std::size_t i = 0; i < sub_meshes.size(); i++)
{
try
{
const Mesh::SubMesh& registered_sub_mesh = mesh->GetSubMesh(i);
if(registered_sub_mesh.vertex_data != sub_meshes[i].vertex_data || registered_sub_mesh.index_data != sub_meshes[i].index_data)
{
found = false;
break;
}
}
catch(...)
{
found = false;
break;
}
}
if(found)
return mesh;
}
return nullptr;
}
void MeshRegistry::UnregisterMesh(std::shared_ptr<Mesh> mesh)
{
m_meshes_registry.erase(mesh);
}
void MeshRegistry::Reset()
{
m_meshes_registry.clear();
}
MeshRegistry::~MeshRegistry()
{
s_instance = nullptr;
}
}
@@ -0,0 +1,33 @@
#ifndef __MLX_PUT_PIXEL_MANAGER__
#define __MLX_PUT_PIXEL_MANAGER__
#include <Renderer/Image.h>
namespace mlx
{
class PutPixelManager
{
public:
PutPixelManager(NonOwningPtr<class Renderer> renderer);
// Returns a valid pointer when a new texture has been created
NonOwningPtr<Texture> DrawPixel(int x, int y, std::uint64_t draw_layer, mlx_color color);
NonOwningPtr<Texture> DrawPixelsArray(int x, int y, std::uint64_t draw_layer, mlx_color* pixels, std::size_t pixels_size);
NonOwningPtr<Texture> DrawPixelsRegion(int x, int y, int w, int h, std::uint64_t draw_layer, mlx_color* pixels);
void ResetRenderData();
~PutPixelManager() = default;
private:
NonOwningPtr<Texture> GetLayer(std::uint64_t draw_layer, bool& is_newlayer);
std::unique_ptr<Texture> NewTexture();
private:
std::unordered_map<std::uint64_t, NonOwningPtr<Texture>> m_placements;
std::vector<std::unique_ptr<Texture>> m_textures;
NonOwningPtr<class Renderer> p_renderer;
std::size_t m_current_texture_index = 0;
};
}
#endif
+50
View File
@@ -0,0 +1,50 @@
#ifndef __MLX_SCENE__
#define __MLX_SCENE__
#include <Renderer/Renderer.h>
#include <Graphics/Text.h>
#include <Graphics/Font.h>
#include <Graphics/Sprite.h>
#include <Graphics/Drawable.h>
#include <Renderer/ViewerData.h>
#include <Maths/Vec4.h>
namespace mlx
{
class Scene
{
public:
Scene() = default;
Sprite& CreateSprite(NonOwningPtr<class Texture> texture) noexcept;
NonOwningPtr<Sprite> GetSpriteFromTexturePositionScaleRotation(NonOwningPtr<Texture> texture, const Vec2f& position, float scale_x, float scale_y, float rotation) const;
void TryEraseSpriteFromTexture(NonOwningPtr<Texture> texture);
bool IsTextureAtGivenDrawLayer(NonOwningPtr<Texture> texture, std::uint64_t draw_layer) const;
Text& CreateText(const std::string& text) noexcept;
NonOwningPtr<Text> GetTextFromPositionAndColor(const std::string& text, const Vec2f& position, const Vec4f& color) const;
bool IsTextAtGivenDrawLayer(const std::string& text, std::uint64_t draw_layer) const;
inline void BindFont(std::shared_ptr<Font> font) { Verify((bool)font, "invalid fond pointer"); p_bound_font = font; }
void BringToDrawLayer(NonOwningPtr<Drawable> drawable, std::uint64_t draw_layer);
inline void ResetScene(Vec4f clear) { m_drawables.clear(); m_clear_color = std::move(clear); m_has_scene_changed = true; }
inline const Vec4f& GetClearColor() const noexcept { return m_clear_color; }
[[nodiscard]] MLX_FORCEINLINE const std::vector<std::shared_ptr<Drawable>>& GetDrawables() const noexcept { return m_drawables; }
inline void ResetChangeChecker() noexcept { m_has_scene_changed = false; }
inline bool HasSceneChanged() const noexcept { return m_has_scene_changed; }
~Scene() = default;
private:
std::vector<std::shared_ptr<Drawable>> m_drawables;
std::shared_ptr<Font> p_bound_font;
Vec4f m_clear_color = { 0.0f, 0.0f, 0.0f, 1.0f };
bool m_has_scene_changed = false;
};
}
#endif
+45
View File
@@ -0,0 +1,45 @@
#ifndef __MLX_SPRITE__
#define __MLX_SPRITE__
#include <Maths/Vec3.h>
#include <Maths/Vec4.h>
#include <Graphics/Mesh.h>
#include <Renderer/Descriptor.h>
#include <Renderer/Image.h>
#include <Graphics/Drawable.h>
namespace mlx
{
class Sprite : public Drawable
{
friend class Render2DPass;
public:
Sprite(NonOwningPtr<Texture> texture);
Sprite(std::shared_ptr<Mesh> mesh, NonOwningPtr<Texture> texture);
MLX_FORCEINLINE void Update(VkCommandBuffer cmd) override
{
Verify((bool)p_texture, "a sprite has no texture attached (internal mlx issue, please report to the devs)");
p_texture->Update(cmd);
}
[[nodiscard]] MLX_FORCEINLINE NonOwningPtr<Texture> GetTexture() const { return p_texture; }
inline ~Sprite() = default;
private:
inline void Bind(std::size_t frame_index, VkCommandBuffer cmd) override
{
if(!p_set)
return;
p_set->SetImage(frame_index, 0, *p_texture);
p_set->Update(frame_index, cmd);
}
private:
NonOwningPtr<Texture> p_texture;
};
}
#endif
+40
View File
@@ -0,0 +1,40 @@
#ifndef __MLX_TEXT__
#define __MLX_TEXT__
#include <Graphics/Font.h>
#include <Graphics/Mesh.h>
#include <Graphics/Drawable.h>
namespace mlx
{
class Text : public Drawable
{
friend class Render2DPass;
public:
Text(const std::string& text, std::shared_ptr<Font> font);
inline Text(const std::string& text, std::shared_ptr<Font> font, std::shared_ptr<Mesh> mesh) : Drawable(DrawableType::Text) { Init(text, font, mesh); }
[[nodiscard]] inline const std::string& GetText() const { return m_text; }
[[nodiscard]] inline std::shared_ptr<Font> GetFont() const { return p_font; }
virtual ~Text() = default;
private:
void Init(const std::string& text, std::shared_ptr<Font> font, std::shared_ptr<Mesh> mesh);
inline void Bind(std::size_t frame_index, VkCommandBuffer cmd) override
{
if(!p_set)
return;
p_set->SetImage(frame_index, 0, const_cast<Texture&>(p_font->GetTexture()));
p_set->Update(frame_index, cmd);
}
private:
std::shared_ptr<Font> p_font;
std::string m_text;
};
}
#endif
+106
View File
@@ -0,0 +1,106 @@
#ifndef __MLX_ANGLES__
#define __MLX_ANGLES__
#include <Maths/Enums.h>
namespace mlx
{
template<typename T> struct EulerAngles;
template<typename T> struct Quat;
template<AngleUnit Unit, typename T>
struct Angle
{
T value;
constexpr Angle() = default;
constexpr Angle(T angle);
template<typename U> constexpr explicit Angle(const Angle<Unit, U>& Angle);
template<AngleUnit FromUnit> constexpr Angle(const Angle<FromUnit, T>& angle);
constexpr Angle(const Angle&) = default;
constexpr Angle(Angle&&) noexcept = default;
~Angle() = default;
constexpr bool ApproxEqual(const Angle& angle) const;
constexpr bool ApproxEqual(const Angle& angle, T max_difference) const;
T GetCos() const;
T GetSin() const;
std::pair<T, T> GetSinCos() const;
T GetTan() const;
constexpr Angle& Normalize();
template<AngleUnit ToUnit> T To() const;
template<AngleUnit ToUnit> Angle<ToUnit, T> ToAngle() const;
constexpr T ToDegrees() const;
constexpr Angle<AngleUnit::Degree, T> ToDegreeAngle() const;
EulerAngles<T> ToEulerAngles() const;
Quat<T> ToQuat() const;
constexpr T ToRadians() const;
constexpr Angle<AngleUnit::Radian, T> ToRadianAngle() const;
std::string ToString() const;
constexpr T ToTurns() const;
constexpr Angle<AngleUnit::Turn, T> ToTurnAngle() const;
constexpr Angle& operator=(const Angle&) = default;
constexpr Angle& operator=(Angle&&) noexcept = default;
constexpr Angle operator+() const;
constexpr Angle operator-() const;
constexpr Angle operator+(Angle other) const;
constexpr Angle operator-(Angle other) const;
constexpr Angle operator*(T scalar) const;
constexpr Angle operator/(T divider) const;
constexpr Angle& operator+=(Angle other);
constexpr Angle& operator-=(Angle other);
constexpr Angle& operator*=(T scalar);
constexpr Angle& operator/=(T divider);
constexpr bool operator==(Angle other) const;
constexpr bool operator!=(Angle other) const;
constexpr bool operator<(Angle other) const;
constexpr bool operator<=(Angle other) const;
constexpr bool operator>(Angle other) const;
constexpr bool operator>=(Angle other) const;
static constexpr bool ApproxEqual(const Angle& lhs, const Angle& rhs);
static constexpr bool ApproxEqual(const Angle& lhs, const Angle& rhs, T max_difference);
static constexpr Angle Clamp(Angle angle, Angle min, Angle max);
template<AngleUnit FromUnit> static constexpr Angle From(T value);
static constexpr Angle FromDegrees(T degrees);
static constexpr Angle FromRadians(T radians);
static constexpr Angle FromTurns(T turn);
static constexpr Angle Zero();
};
template<typename T>
using DegreeAngle = Angle<AngleUnit::Degree, T>;
using DegreeAngled = DegreeAngle<double>;
using DegreeAnglef = DegreeAngle<float>;
template<typename T>
using RadianAngle = Angle<AngleUnit::Radian, T>;
using RadianAngled = RadianAngle<double>;
using RadianAnglef = RadianAngle<float>;
template<typename T>
using TurnAngle = Angle<AngleUnit::Turn, T>;
using TurnAngled = TurnAngle<double>;
using TurnAnglef = TurnAngle<float>;
template<AngleUnit Unit, typename T> Angle<Unit, T> operator*(T scale, Angle<Unit, T> angle);
template<AngleUnit Unit, typename T> Angle<Unit, T> operator/(T divider, Angle<Unit, T> angle);
template<AngleUnit Unit, typename T> std::ostream& operator<<(std::ostream& out, Angle<Unit, T> angle);
}
#include <Maths/Angles.inl>
#endif
+493
View File
@@ -0,0 +1,493 @@
#pragma once
#include <Maths/Angles.h>
#include <Maths/Constants.h>
#include <Maths/MathsUtils.h>
namespace mlx
{
namespace Internal
{
template<AngleUnit From, AngleUnit To> struct AngleConversion;
template<AngleUnit Unit>
struct AngleConversion<Unit, Unit>
{
template<typename T>
static constexpr T Convert(T angle)
{
return angle;
}
};
template<>
struct AngleConversion<AngleUnit::Degree, AngleUnit::Radian>
{
template<typename T>
static constexpr T Convert(T angle)
{
return DegreeToRadian(angle);
}
};
template<>
struct AngleConversion<AngleUnit::Degree, AngleUnit::Turn>
{
template<typename T>
static constexpr T Convert(T angle)
{
return angle / T(360);
}
};
template<>
struct AngleConversion<AngleUnit::Radian, AngleUnit::Degree>
{
template<typename T>
static constexpr T Convert(T angle)
{
return RadianToDegree(angle);
}
};
template<>
struct AngleConversion<AngleUnit::Radian, AngleUnit::Turn>
{
template<typename T>
static constexpr T Convert(T angle)
{
return angle / Tau<T>();
}
};
template<>
struct AngleConversion<AngleUnit::Turn, AngleUnit::Degree>
{
template<typename T>
static constexpr T Convert(T angle)
{
return angle * T(360);
}
};
template<>
struct AngleConversion<AngleUnit::Turn, AngleUnit::Radian>
{
template<typename T>
static constexpr T Convert(T angle)
{
return angle * Tau<T>();
}
};
template<AngleUnit Unit> struct AngleUtils;
template<>
struct AngleUtils<AngleUnit::Degree>
{
template<typename T>
static constexpr T GetEpsilon()
{
return T(1e-4);
}
template<typename T>
static constexpr T GetLimit()
{
return 360;
}
template<typename T> static std::ostream& ToString(std::ostream& out, T value)
{
return out << "Angle(" << value << "deg)";
}
};
template<>
struct AngleUtils<AngleUnit::Radian>
{
template<typename T>
static constexpr T GetEpsilon()
{
return T(1e-5);
}
template<typename T>
static constexpr T GetLimit()
{
return Tau<T>();
}
template<typename T>
static std::ostream& ToString(std::ostream& out, T value)
{
return out << "Angle(" << value << "rad)";
}
};
template<>
struct AngleUtils<AngleUnit::Turn>
{
template<typename T>
static constexpr T GetEpsilon()
{
return T(1e-5);
}
template<typename T>
static constexpr T GetLimit()
{
return 1;
}
template<typename T>
static std::ostream& ToString(std::ostream& out, T value)
{
return out << "Angle(" << value << "turn)";
}
};
#ifdef MLX_PLAT_LINUX
template<typename T>
void SinCos(T x, T* sin, T* cos)
{
double s, c;
::sincos(x, &s, &c);
*sin = static_cast<T>(s);
*cos = static_cast<T>(c);
}
template<>
inline void SinCos(float x, float* s, float* c)
{
::sincosf(x, s, c);
}
template<>
inline void SinCos(long double x, long double* s, long double* c)
{
::sincosl(x, s, c);
}
#else
template<typename T>
void SinCos(T x, T* sin, T* cos)
{
*sin = std::sin(x);
*cos = std::cos(x);
}
#endif
}
template<AngleUnit Unit, typename T>
constexpr Angle<Unit, T>::Angle(T angle) :
value(angle)
{
}
template<AngleUnit Unit, typename T>
template<typename U>
constexpr Angle<Unit, T>::Angle(const Angle<Unit, U>& angle) :
value(static_cast<T>(angle.value))
{
}
template<AngleUnit Unit, typename T>
template<AngleUnit FromUnit>
constexpr Angle<Unit, T>::Angle(const Angle<FromUnit, T>& angle) :
value(Internal::AngleConversion<FromUnit, Unit>::Convert(angle.value))
{
}
template<AngleUnit Unit, typename T>
constexpr bool Angle<Unit, T>::ApproxEqual(const Angle& angle) const
{
return ApproxEqual(angle, Internal::AngleUtils<Unit>::template GetEpsilon<T>());
}
template<AngleUnit Unit, typename T>
constexpr bool Angle<Unit, T>::ApproxEqual(const Angle& angle, T maxDifference) const
{
return NumberEquals(value, angle.value, maxDifference);
}
template<AngleUnit Unit, typename T>
T Angle<Unit, T>::GetCos() const
{
return std::cos(ToRadians());
}
template<AngleUnit Unit, typename T>
T Angle<Unit, T>::GetSin() const
{
return std::sin(ToRadians());
}
template<AngleUnit Unit, typename T>
std::pair<T, T> Angle<Unit, T>::GetSinCos() const
{
T sin, cos;
Internal::SinCos<T>(ToRadians(), &sin, &cos);
return std::make_pair(sin, cos);
}
template<AngleUnit Unit, typename T>
T Angle<Unit, T>::GetTan() const
{
return std::tan(ToRadians());
}
template<AngleUnit Unit, typename T>
constexpr Angle<Unit, T>& Angle<Unit, T>::Normalize()
{
constexpr T limit = Internal::AngleUtils<Unit>::template GetLimit<T>();
constexpr T halfLimit = limit / T(2);
value = Mod(value + halfLimit, limit);
if (value < T(0))
value += limit;
value -= halfLimit;
return *this;
}
template<AngleUnit Unit, typename T>
template<AngleUnit ToUnit>
T Angle<Unit, T>::To() const
{
return Internal::AngleConversion<Unit, ToUnit>::Convert(value);
}
template<AngleUnit Unit, typename T>
template<AngleUnit ToUnit>
Angle<ToUnit, T> Angle<Unit, T>::ToAngle() const
{
return Angle<ToUnit, T>(To<ToUnit>());
}
template<AngleUnit Unit, typename T>
constexpr T Angle<Unit, T>::ToDegrees() const
{
return To<AngleUnit::Degree>();
}
template<AngleUnit Unit, typename T>
constexpr Angle<AngleUnit::Degree, T> Angle<Unit, T>::ToDegreeAngle() const
{
return ToAngle<AngleUnit::Degree>();
}
template<AngleUnit Unit, typename T>
EulerAngles<T> Angle<Unit, T>::ToEulerAngles() const
{
return EulerAngles<T>(0, 0, ToDegrees());
}
template<AngleUnit Unit, typename T>
Quat<T> Angle<Unit, T>::ToQuat() const
{
auto halfAngle = Angle(*this) / 2.f;
auto sincos = halfAngle.GetSinCos();
return Quat<T>(sincos.second, 0, 0, sincos.first);
}
template<AngleUnit Unit, typename T>
constexpr T Angle<Unit, T>::ToRadians() const
{
return To<AngleUnit::Radian>();
}
template<AngleUnit Unit, typename T>
constexpr Angle<AngleUnit::Radian, T> Angle<Unit, T>::ToRadianAngle() const
{
return ToAngle<AngleUnit::Radian>();
}
template<AngleUnit Unit, typename T>
std::string Angle<Unit, T>::ToString() const
{
std::ostringstream oss;
Internal::AngleUtils<Unit>::ToString(oss, value);
return oss.str();
}
template<AngleUnit Unit, typename T>
constexpr T Angle<Unit, T>::ToTurns() const
{
return To<AngleUnit::Turn>(value);
}
template<AngleUnit Unit, typename T>
constexpr Angle<AngleUnit::Turn, T> Angle<Unit, T>::ToTurnAngle() const
{
return ToAngle<AngleUnit::Turn>();
}
template<AngleUnit Unit, typename T>
constexpr Angle<Unit, T> Angle<Unit, T>::operator+() const
{
return *this;
}
template<AngleUnit Unit, typename T>
constexpr Angle<Unit, T> Angle<Unit, T>::operator-() const
{
return Angle(-value);
}
template<AngleUnit Unit, typename T>
constexpr Angle<Unit, T> Angle<Unit, T>::operator+(Angle other) const
{
return Angle(value + other.value);
}
template<AngleUnit Unit, typename T>
constexpr Angle<Unit, T> Angle<Unit, T>::operator-(Angle other) const
{
return Angle(value - other.value);
}
template<AngleUnit Unit, typename T>
constexpr Angle<Unit, T> Angle<Unit, T>::operator*(T scalar) const
{
return Angle(value * scalar);
}
template<AngleUnit Unit, typename T>
constexpr Angle<Unit, T> Angle<Unit, T>::operator/(T divider) const
{
return Angle(value / divider);
}
template<AngleUnit Unit, typename T>
constexpr Angle<Unit, T>& Angle<Unit, T>::operator+=(Angle other)
{
value += other.value;
return *this;
}
template<AngleUnit Unit, typename T>
constexpr Angle<Unit, T>& Angle<Unit, T>::operator-=(Angle other)
{
value -= other.value;
return *this;
}
template<AngleUnit Unit, typename T>
constexpr Angle<Unit, T>& Angle<Unit, T>::operator*=(T scalar)
{
value *= scalar;
return *this;
}
template<AngleUnit Unit, typename T>
constexpr Angle<Unit, T>& Angle<Unit, T>::operator/=(T divider)
{
value /= divider;
return *this;
}
template<AngleUnit Unit, typename T>
constexpr bool Angle<Unit, T>::operator==(Angle other) const
{
return value == other.value;
}
template<AngleUnit Unit, typename T>
constexpr bool Angle<Unit, T>::operator!=(Angle other) const
{
return value != other.value;
}
template<AngleUnit Unit, typename T>
constexpr bool Angle<Unit, T>::operator<(Angle other) const
{
return value < other.value;
}
template<AngleUnit Unit, typename T>
constexpr bool Angle<Unit, T>::operator<=(Angle other) const
{
return value <= other.value;
}
template<AngleUnit Unit, typename T>
constexpr bool Angle<Unit, T>::operator>(Angle other) const
{
return value > other.value;
}
template<AngleUnit Unit, typename T>
constexpr bool Angle<Unit, T>::operator>=(Angle other) const
{
return value >= other.value;
}
template<AngleUnit Unit, typename T>
constexpr bool Angle<Unit, T>::ApproxEqual(const Angle& lhs, const Angle& rhs)
{
return lhs.ApproxEqual(rhs);
}
template<AngleUnit Unit, typename T>
constexpr bool Angle<Unit, T>::ApproxEqual(const Angle& lhs, const Angle& rhs, T maxDifference)
{
return lhs.ApproxEqual(rhs, maxDifference);
}
template<AngleUnit Unit, typename T>
constexpr Angle<Unit, T> Angle<Unit, T>::Clamp(Angle angle, Angle min, Angle max)
{
return Angle(std::clamp(angle.value, min.value, max.value));
}
template<AngleUnit Unit, typename T>
template<AngleUnit FromUnit>
constexpr Angle<Unit, T> Angle<Unit, T>::From(T value)
{
return Angle(Internal::AngleConversion<FromUnit, Unit>::Convert(value));
}
template<AngleUnit Unit, typename T>
constexpr Angle<Unit, T> Angle<Unit, T>::FromDegrees(T degrees)
{
return From<AngleUnit::Degree>(degrees);
}
template<AngleUnit Unit, typename T>
constexpr Angle<Unit, T> Angle<Unit, T>::FromRadians(T radians)
{
return From<AngleUnit::Radian>(radians);
}
template<AngleUnit Unit, typename T>
constexpr Angle<Unit, T> Angle<Unit, T>::FromTurns(T turns)
{
return From<AngleUnit::Turn>(turns);
}
template<AngleUnit Unit, typename T>
constexpr Angle<Unit, T> Angle<Unit, T>::Zero()
{
return Angle(0);
}
template<AngleUnit Unit, typename T>
Angle<Unit, T> operator/(T scale, Angle<Unit, T> angle)
{
return Angle<Unit, T>(scale / angle.value);
}
template<AngleUnit Unit, typename T>
std::ostream& operator<<(std::ostream& out, Angle<Unit, T> angle)
{
return Internal::AngleUtils<Unit>::ToString(out, angle.value);
}
template<typename T, AngleUnit Unit>
constexpr Angle<Unit, T> Clamp(Angle<Unit, T> value, T min, T max)
{
return std::max(std::min(value.value, max), min);
}
}
+83
View File
@@ -0,0 +1,83 @@
#ifndef __MLX_MATHS_CONSTANTS__
#define __MLX_MATHS_CONSTANTS__
namespace mlx
{
template<typename T> constexpr std::size_t BitCount = CHAR_BIT * sizeof(T);
template<typename T>
struct MathConstants
{
static constexpr T Infinity()
{
static_assert(std::numeric_limits<T>::has_infinity);
return std::numeric_limits<T>::infinity();
}
static constexpr T Max()
{
return std::numeric_limits<T>::max();
}
static constexpr T Min()
{
return std::numeric_limits<T>::min();
}
static constexpr T NaN()
{
static_assert(std::numeric_limits<T>::has_signaling_NaN);
return std::numeric_limits<T>::quiet_NaN();
}
// Math constants
static constexpr T HalfPi()
{
static_assert(std::is_floating_point_v<T>);
return T(1.5707963267948966192313216916398);
}
static constexpr T Pi()
{
static_assert(std::is_floating_point_v<T>);
return T(3.1415926535897932384626433832795);
}
static constexpr T Sqrt2()
{
static_assert(std::is_floating_point_v<T>);
return T(1.4142135623730950488016887242097);
}
static constexpr T Sqrt3()
{
static_assert(std::is_floating_point_v<T>);
return T(1.7320508075688772935274463415059);
}
static constexpr T Sqrt5()
{
static_assert(std::is_floating_point_v<T>);
return T(2.2360679774997896964091736687313);
}
static constexpr T Tau()
{
static_assert(std::is_floating_point_v<T>);
return T(6.2831853071795864769252867665590);
}
};
template<typename T = void> constexpr auto Infinity() { return MathConstants<T>::Infinity(); }
template<typename T = void> constexpr auto MaxValue() { return MathConstants<T>::Max(); }
template<typename T = void> constexpr auto MinValue() { return MathConstants<T>::Min(); }
template<typename T = void> constexpr auto NaN() { return MathConstants<T>::NaN(); }
template<typename T = void> constexpr auto HalfPi() { return MathConstants<T>::HalfPi(); }
template<typename T = void> constexpr auto Pi() { return MathConstants<T>::Pi(); }
template<typename T = void> constexpr auto Sqrt2() { return MathConstants<T>::Sqrt2(); }
template<typename T = void> constexpr auto Sqrt3() { return MathConstants<T>::Sqrt3(); }
template<typename T = void> constexpr auto Sqrt5() { return MathConstants<T>::Sqrt5(); }
template<typename T = void> constexpr auto Tau() { return MathConstants<T>::Tau(); }
}
#endif
+18
View File
@@ -0,0 +1,18 @@
#ifndef __MLX_MATHS_ENUMS__
#define __MLX_MATHS_ENUMS__
namespace mlx
{
enum class AngleUnit
{
Degree = 0,
Radian,
Turn,
EndEnum
};
constexpr std::size_t AngleUnitCount = static_cast<std::size_t>(AngleUnit::EndEnum);
}
#endif
+55
View File
@@ -0,0 +1,55 @@
#ifndef __MLX_EULER_ANGLES__
#define __MLX_EULER_ANGLES__
#include <Maths/Angles.h>
namespace mlx
{
template<typename T>
struct EulerAngles
{
constexpr EulerAngles() = default;
constexpr EulerAngles(DegreeAngle<T> P, DegreeAngle<T> Y, DegreeAngle<T> R);
constexpr EulerAngles(const DegreeAngle<T> angles[3]);
template<AngleUnit Unit> constexpr EulerAngles(const Angle<Unit, T>& angle);
constexpr EulerAngles(const Quat<T>& quat);
template<typename U> constexpr explicit EulerAngles(const EulerAngles<U>& angles);
constexpr EulerAngles(const EulerAngles&) = default;
constexpr EulerAngles(EulerAngles&&) = default;
~EulerAngles() = default;
constexpr bool ApproxEqual(const EulerAngles& angles, T maxDifference = std::numeric_limits<T>::epsilon()) const;
constexpr EulerAngles& Normalize();
Quat<T> ToQuat() const;
std::string ToString() const;
constexpr EulerAngles operator+(const EulerAngles& angles) const;
constexpr EulerAngles operator-(const EulerAngles& angles) const;
constexpr EulerAngles& operator=(const EulerAngles&) = default;
constexpr EulerAngles& operator=(EulerAngles&&) = default;
constexpr EulerAngles& operator+=(const EulerAngles& angles);
constexpr EulerAngles& operator-=(const EulerAngles& angles);
constexpr bool operator==(const EulerAngles& angles) const;
constexpr bool operator!=(const EulerAngles& angles) const;
constexpr bool operator<(const EulerAngles& angles) const;
constexpr bool operator<=(const EulerAngles& angles) const;
constexpr bool operator>(const EulerAngles& angles) const;
constexpr bool operator>=(const EulerAngles& angles) const;
static constexpr bool ApproxEqual(const EulerAngles& lhs, const EulerAngles& rhs, T maxDifference = std::numeric_limits<T>::epsilon());
static constexpr EulerAngles Zero();
DegreeAngle<T> pitch, yaw, roll;
};
using EulerAnglesf = EulerAngles<float>;
}
#include <Maths/EulerAngles.inl>
#endif
+169
View File
@@ -0,0 +1,169 @@
#pragma once
#include <Maths/EulerAngles.h>
namespace mlx
{
template<typename T>
constexpr EulerAngles<T>::EulerAngles(DegreeAngle<T> P, DegreeAngle<T> Y, DegreeAngle<T> R) :
pitch(P), yaw(Y), roll(R)
{}
template<typename T>
constexpr EulerAngles<T>::EulerAngles(const DegreeAngle<T> angles[3]) :
EulerAngles(angles[0], angles[1], angles[2])
{}
template<typename T>
template<AngleUnit Unit>
constexpr EulerAngles<T>::EulerAngles(const Angle<Unit, T>& angle) :
EulerAngles(angle.ToEulerAngles())
{}
template<typename T>
constexpr EulerAngles<T>::EulerAngles(const Quat<T>& quat) :
EulerAngles(quat.ToEulerAngles())
{}
template<typename T>
template<typename U>
constexpr EulerAngles<T>::EulerAngles(const EulerAngles<U>& angles) :
pitch(DegreeAngle<T>(angles.pitch)), yaw(DegreeAngle<T>(angles.yaw)), roll(DegreeAngle<T>(angles.roll))
{}
template<typename T>
constexpr bool EulerAngles<T>::ApproxEqual(const EulerAngles& angles, T maxDifference) const
{
return pitch.ApproxEqual(angles.pitch, maxDifference) && yaw.ApproxEqual(angles.yaw, maxDifference) && roll.ApproxEqual(angles.roll, maxDifference);
}
template<typename T>
constexpr EulerAngles<T>& EulerAngles<T>::Normalize()
{
pitch.Normalize();
yaw.Normalize();
roll.Normalize();
return *this;
}
template<typename T>
Quat<T> EulerAngles<T>::ToQuat() const
{
// XYZ
auto [s1, c1] = (yaw / T(2.0)).GetSinCos();
auto [s2, c2] = (roll / T(2.0)).GetSinCos();
auto [s3, c3] = (pitch / T(2.0)).GetSinCos();
return Quat<T>(c1 * c2 * c3 - s1 * s2 * s3,
s1 * s2 * c3 + c1 * c2 * s3,
s1 * c2 * c3 + c1 * s2 * s3,
c1 * s2 * c3 - s1 * c2 * s3);
}
template<typename T>
std::string EulerAngles<T>::ToString() const
{
std::ostringstream ss;
ss << *this;
return ss.str();
}
template<typename T>
constexpr EulerAngles<T> EulerAngles<T>::operator+(const EulerAngles& angles) const
{
return EulerAngles(pitch + angles.pitch, yaw + angles.yaw, roll + angles.roll);
}
template<typename T>
constexpr EulerAngles<T> EulerAngles<T>::operator-(const EulerAngles& angles) const
{
return EulerAngles(pitch - angles.pitch, yaw - angles.yaw, roll - angles.roll);
}
template<typename T>
constexpr EulerAngles<T>& EulerAngles<T>::operator+=(const EulerAngles& angles)
{
pitch += angles.pitch;
yaw += angles.yaw;
roll += angles.roll;
return *this;
}
template<typename T>
constexpr EulerAngles<T>& EulerAngles<T>::operator-=(const EulerAngles& angles)
{
pitch -= angles.pitch;
yaw -= angles.yaw;
roll -= angles.roll;
return *this;
}
template<typename T>
constexpr bool EulerAngles<T>::operator==(const EulerAngles& angles) const
{
return pitch == angles.pitch && yaw == angles.yaw && roll == angles.roll;
}
template<typename T>
constexpr bool EulerAngles<T>::operator!=(const EulerAngles& angles) const
{
return !operator==(angles);
}
template<typename T>
constexpr bool EulerAngles<T>::operator<(const EulerAngles& angles) const
{
if (pitch != angles.pitch)
return pitch < angles.pitch;
if (yaw != angles.yaw)
return yaw < angles.yaw;
return roll < angles.roll;
}
template<typename T>
constexpr bool EulerAngles<T>::operator<=(const EulerAngles& angles) const
{
if (pitch != angles.pitch)
return pitch < angles.pitch;
if (yaw != angles.yaw)
return yaw < angles.yaw;
return roll <= angles.roll;
}
template<typename T>
constexpr bool EulerAngles<T>::operator>(const EulerAngles& angles) const
{
if (pitch != angles.pitch)
return pitch > angles.pitch;
if (yaw != angles.yaw)
return yaw > angles.yaw;
return roll > angles.roll;
}
template<typename T>
constexpr bool EulerAngles<T>::operator>=(const EulerAngles& angles) const
{
if (pitch != angles.pitch)
return pitch > angles.pitch;
if (yaw != angles.yaw)
return yaw > angles.yaw;
return roll >= angles.roll;
}
template<typename T>
constexpr bool EulerAngles<T>::ApproxEqual(const EulerAngles& lhs, const EulerAngles& rhs, T maxDifference)
{
return lhs.ApproxEqual(rhs, maxDifference);
}
template<typename T>
constexpr EulerAngles<T> EulerAngles<T>::Zero()
{
return EulerAngles(0, 0, 0);
}
template<typename T>
std::ostream& operator<<(std::ostream& out, const EulerAngles<T>& angles)
{
return out << "EulerAngles(" << angles.pitch << ", " << angles.yaw << ", " << angles.roll << ')';
}
}
+118
View File
@@ -0,0 +1,118 @@
#ifndef __MLX_MAT4__
#define __MLX_MAT4__
#include <Maths/Angles.h>
namespace mlx
{
template<typename T> struct Vec2;
template<typename T> struct Vec3;
template<typename T> struct Vec4;
template<typename T> struct Quat;
template<typename T>
struct Mat4
{
T m11, m12, m13, m14;
T m21, m22, m23, m24;
T m31, m32, m33, m34;
T m41, m42, m43, m44;
constexpr Mat4() = default;
constexpr Mat4(T r11, T r12, T r13, T r14,
T r21, T r22, T r23, T r24,
T r31, T r32, T r33, T r34,
T r41, T r42, T r43, T r44);
constexpr Mat4(const T matrix[16]);
constexpr Mat4(const Mat4&) = default;
constexpr Mat4(Mat4&&) = default;
constexpr Mat4& ApplyRotation(const Quat<T>& rotation);
constexpr Mat4& ApplyScale(const Vec3<T>& scale);
constexpr Mat4& ApplyTranslation(const Vec3<T>& translation);
constexpr bool ApproxEqual(const Mat4& vec, T max_difference = std::numeric_limits<T>::epsilon()) const;
constexpr Mat4& Concatenate(const Mat4& matrix);
constexpr Mat4& ConcatenateTransform(const Mat4& matrix);
constexpr Vec4<T> GetColumn(std::size_t column) const;
constexpr T GetDeterminant() const;
constexpr T GetDeterminantTransform() const;
constexpr bool GetInverse(Mat4* dest) const;
constexpr bool GetInverseTransform(Mat4* dest) const;
Quat<T> GetRotation() const;
constexpr Vec4<T> GetRow(std::size_t row) const;
constexpr Vec3<T> GetScale() const;
constexpr Vec3<T> GetSquaredScale() const;
constexpr Vec3<T> GetTranslation() const;
constexpr void GetTransposed(Mat4* dest) const;
constexpr bool HasNegativeScale() const;
constexpr bool HasScale() const;
constexpr Mat4& Inverse(bool* succeeded = nullptr);
constexpr Mat4& InverseTransform(bool* succeeded = nullptr);
constexpr bool IsTransformMatrix() const;
constexpr bool IsIdentity() const;
constexpr Mat4& SetRotation(const Quat<T>& rotation);
constexpr Mat4& SetScale(const Vec3<T>& scale);
constexpr Mat4& SetTranslation(const Vec3<T>& translation);
std::string ToString() const;
constexpr Vec2<T> Transform(const Vec2<T>& vector, T z = 0.0, T w = 1.0) const;
constexpr Vec3<T> Transform(const Vec3<T>& vector, T w = 1.0) const;
constexpr Vec4<T> Transform(const Vec4<T>& vector) const;
constexpr Mat4& Transpose();
constexpr T& operator()(std::size_t x, std::size_t y);
constexpr const T& operator()(std::size_t x, std::size_t y) const;
constexpr T& operator[](std::size_t i);
constexpr const T& operator[](std::size_t i) const;
constexpr Mat4& operator=(const Mat4&) = default;
constexpr Mat4& operator=(Mat4&&) = default;
constexpr Mat4 operator*(const Mat4& matrix) const;
constexpr Vec2<T> operator*(const Vec2<T>& vector) const;
constexpr Vec3<T> operator*(const Vec3<T>& vector) const;
constexpr Vec4<T> operator*(const Vec4<T>& vector) const;
constexpr Mat4 operator*(T scalar) const;
constexpr Mat4& operator*=(const Mat4& matrix);
constexpr Mat4& operator*=(T scalar);
constexpr bool operator==(const Mat4& mat) const;
constexpr bool operator!=(const Mat4& mat) const;
static constexpr bool ApproxEqual(const Mat4& lhs, const Mat4& rhs, T max_difference = std::numeric_limits<T>::epsilon());
static constexpr Mat4 Concatenate(const Mat4& left, const Mat4& right);
static constexpr Mat4 ConcatenateTransform(const Mat4& left, const Mat4& right);
static constexpr Mat4 Identity();
static constexpr Mat4 LookAt(const Vec3<T>& eye, const Vec3<T>& target, const Vec3<T>& up = Vec3<T>::Up());
static constexpr Mat4 Ortho(T left, T right, T top, T bottom, T z_near = -1.0, T zFar = 1.0);
static Mat4 Perspective(RadianAngle<T> angle, T ratio, T z_near, T z_far);
static constexpr Mat4 Rotate(const Quat<T>& rotation);
static constexpr Mat4 Scale(const Vec3<T>& scale);
static constexpr Mat4 Translate(const Vec3<T>& translation);
static constexpr Mat4 Transform(const Vec3<T>& translation, const Quat<T>& rotation);
static constexpr Mat4 Transform(const Vec3<T>& translation, const Quat<T>& rotation, const Vec3<T>& scale);
static constexpr Mat4 TransformInverse(const Vec3<T>& translation, const Quat<T>& rotation);
static constexpr Mat4 TransformInverse(const Vec3<T>& translation, const Quat<T>& rotation, const Vec3<T>& scale);
static constexpr Mat4 Zero();
~Mat4() = default;
};
using Mat4d = Mat4<double>;
using Mat4f = Mat4<float>;
}
#include <Maths/Mat4.inl>
#endif
+875
View File
@@ -0,0 +1,875 @@
#pragma once
#include <Maths/Mat4.h>
#include <Maths/EulerAngles.h>
#include <Maths/Quaternions.h>
#include <Maths/Vec2.h>
#include <Maths/Vec3.h>
#include <Maths/Vec4.h>
#include <Maths/MathsUtils.h>
namespace mlx
{
template<typename T>
constexpr Mat4<T>::Mat4(T r11, T r12, T r13, T r14,
T r21, T r22, T r23, T r24,
T r31, T r32, T r33, T r34,
T r41, T r42, T r43, T r44) :
m11(r11), m12(r12), m13(r13), m14(r14),
m21(r21), m22(r22), m23(r23), m24(r24),
m31(r31), m32(r32), m33(r33), m34(r34),
m41(r41), m42(r42), m43(r43), m44(r44)
{}
template<typename T>
constexpr Mat4<T>::Mat4(const T matrix[16]) :
Mat4(matrix[ 0], matrix[ 1], matrix[ 2], matrix[ 3],
matrix[ 4], matrix[ 5], matrix[ 6], matrix[ 7],
matrix[ 8], matrix[ 9], matrix[10], matrix[11],
matrix[12], matrix[13], matrix[14], matrix[15])
{}
template<typename T>
constexpr Mat4<T>& Mat4<T>::ApplyRotation(const Quat<T>& rotation)
{
return Concatenate(Mat4<T>::Rotate(rotation));
}
template<typename T>
constexpr Mat4<T>& Mat4<T>::ApplyScale(const Vec3<T>& scale)
{
m11 *= scale.x;
m12 *= scale.x;
m13 *= scale.x;
m21 *= scale.y;
m22 *= scale.y;
m23 *= scale.y;
m31 *= scale.z;
m32 *= scale.z;
m33 *= scale.z;
return *this;
}
template<typename T>
constexpr Mat4<T>& Mat4<T>::ApplyTranslation(const Vec3<T>& translation)
{
m41 += translation.x;
m42 += translation.y;
m43 += translation.z;
return *this;
}
template<typename T>
constexpr bool Mat4<T>::ApproxEqual(const Mat4& mat, T maxDifference) const
{
for(unsigned int i = 0; i < 16; ++i)
if(!NumberEquals((&m11)[i], (&mat.m11)[i], maxDifference))
return false;
return true;
}
template<typename T>
constexpr Mat4<T>& Mat4<T>::Concatenate(const Mat4& matrix)
{
return operator=(Mat4(
m11 * matrix.m11 + m12 * matrix.m21 + m13 * matrix.m31 + m14 * matrix.m41,
m11 * matrix.m12 + m12 * matrix.m22 + m13 * matrix.m32 + m14 * matrix.m42,
m11 * matrix.m13 + m12 * matrix.m23 + m13 * matrix.m33 + m14 * matrix.m43,
m11 * matrix.m14 + m12 * matrix.m24 + m13 * matrix.m34 + m14 * matrix.m44,
m21 * matrix.m11 + m22 * matrix.m21 + m23 * matrix.m31 + m24 * matrix.m41,
m21 * matrix.m12 + m22 * matrix.m22 + m23 * matrix.m32 + m24 * matrix.m42,
m21 * matrix.m13 + m22 * matrix.m23 + m23 * matrix.m33 + m24 * matrix.m43,
m21 * matrix.m14 + m22 * matrix.m24 + m23 * matrix.m34 + m24 * matrix.m44,
m31 * matrix.m11 + m32 * matrix.m21 + m33 * matrix.m31 + m34 * matrix.m41,
m31 * matrix.m12 + m32 * matrix.m22 + m33 * matrix.m32 + m34 * matrix.m42,
m31 * matrix.m13 + m32 * matrix.m23 + m33 * matrix.m33 + m34 * matrix.m43,
m31 * matrix.m14 + m32 * matrix.m24 + m33 * matrix.m34 + m34 * matrix.m44,
m41 * matrix.m11 + m42 * matrix.m21 + m43 * matrix.m31 + m44 * matrix.m41,
m41 * matrix.m12 + m42 * matrix.m22 + m43 * matrix.m32 + m44 * matrix.m42,
m41 * matrix.m13 + m42 * matrix.m23 + m43 * matrix.m33 + m44 * matrix.m43,
m41 * matrix.m14 + m42 * matrix.m24 + m43 * matrix.m34 + m44 * matrix.m44
));
}
template<typename T>
constexpr Mat4<T>& Mat4<T>::ConcatenateTransform(const Mat4& matrix)
{
return operator=(Mat4(
m11*matrix.m11 + m12*matrix.m21 + m13*matrix.m31,
m11*matrix.m12 + m12*matrix.m22 + m13*matrix.m32,
m11*matrix.m13 + m12*matrix.m23 + m13*matrix.m33,
T(0.0),
m21*matrix.m11 + m22*matrix.m21 + m23*matrix.m31,
m21*matrix.m12 + m22*matrix.m22 + m23*matrix.m32,
m21*matrix.m13 + m22*matrix.m23 + m23*matrix.m33,
T(0.0),
m31*matrix.m11 + m32*matrix.m21 + m33*matrix.m31,
m31*matrix.m12 + m32*matrix.m22 + m33*matrix.m32,
m31*matrix.m13 + m32*matrix.m23 + m33*matrix.m33,
T(0.0),
m41*matrix.m11 + m42*matrix.m21 + m43*matrix.m31 + matrix.m41,
m41*matrix.m12 + m42*matrix.m22 + m43*matrix.m32 + matrix.m42,
m41*matrix.m13 + m42*matrix.m23 + m43*matrix.m33 + matrix.m43,
T(1.0)
));
}
template<typename T>
constexpr Vec4<T> Mat4<T>::GetColumn(std::size_t column) const
{
Assert(column < 4, "column index out of range");
const T* ptr = &m11 + column * 4;
return Vec4<T>(ptr[0], ptr[1], ptr[2], ptr[3]);
}
template<typename T>
constexpr T Mat4<T>::GetDeterminant() const
{
T A = m22*(m33*m44 - m43*m34) - m32*(m23*m44 - m43*m24) + m42*(m23*m34 - m33*m24);
T B = m12*(m33*m44 - m43*m34) - m32*(m13*m44 - m43*m14) + m42*(m13*m34 - m33*m14);
T C = m12*(m23*m44 - m43*m24) - m22*(m13*m44 - m43*m14) + m42*(m13*m24 - m23*m14);
T D = m12*(m23*m34 - m33*m24) - m22*(m13*m34 - m33*m14) + m32*(m13*m24 - m23*m14);
return m11*A - m21*B + m31*C - m41*D;
}
template<typename T>
constexpr T Mat4<T>::GetDeterminantTransform() const
{
T A = m22*m33 - m32*m23;
T B = m12*m33 - m32*m13;
T C = m12*m23 - m22*m13;
return m11*A - m21*B + m31*C;
}
template<typename T>
constexpr bool Mat4<T>::GetInverse(Mat4* dest) const
{
Assert(dest, "destination matrix must be valid");
T det = GetDeterminant();
if(det == T(0.0))
return false;
// http://stackoverflow.com/questions/1148309/inverting-a-4x4-matrix
T inv[16];
inv[0] = m22 * m33 * m44 -
m22 * m34 * m43 -
m32 * m23 * m44 +
m32 * m24 * m43 +
m42 * m23 * m34 -
m42 * m24 * m33;
inv[1] = -m12 * m33 * m44 +
m12 * m34 * m43 +
m32 * m13 * m44 -
m32 * m14 * m43 -
m42 * m13 * m34 +
m42 * m14 * m33;
inv[2] = m12 * m23 * m44 -
m12 * m24 * m43 -
m22 * m13 * m44 +
m22 * m14 * m43 +
m42 * m13 * m24 -
m42 * m14 * m23;
inv[3] = -m12 * m23 * m34 +
m12 * m24 * m33 +
m22 * m13 * m34 -
m22 * m14 * m33 -
m32 * m13 * m24 +
m32 * m14 * m23;
inv[4] = -m21 * m33 * m44 +
m21 * m34 * m43 +
m31 * m23 * m44 -
m31 * m24 * m43 -
m41 * m23 * m34 +
m41 * m24 * m33;
inv[5] = m11 * m33 * m44 -
m11 * m34 * m43 -
m31 * m13 * m44 +
m31 * m14 * m43 +
m41 * m13 * m34 -
m41 * m14 * m33;
inv[6] = -m11 * m23 * m44 +
m11 * m24 * m43 +
m21 * m13 * m44 -
m21 * m14 * m43 -
m41 * m13 * m24 +
m41 * m14 * m23;
inv[7] = m11 * m23 * m34 -
m11 * m24 * m33 -
m21 * m13 * m34 +
m21 * m14 * m33 +
m31 * m13 * m24 -
m31 * m14 * m23;
inv[8] = m21 * m32 * m44 -
m21 * m34 * m42 -
m31 * m22 * m44 +
m31 * m24 * m42 +
m41 * m22 * m34 -
m41 * m24 * m32;
inv[9] = -m11 * m32 * m44 +
m11 * m34 * m42 +
m31 * m12 * m44 -
m31 * m14 * m42 -
m41 * m12 * m34 +
m41 * m14 * m32;
inv[10] = m11 * m22 * m44 -
m11 * m24 * m42 -
m21 * m12 * m44 +
m21 * m14 * m42 +
m41 * m12 * m24 -
m41 * m14 * m22;
inv[11] = -m11 * m22 * m34 +
m11 * m24 * m32 +
m21 * m12 * m34 -
m21 * m14 * m32 -
m31 * m12 * m24 +
m31 * m14 * m22;
inv[12] = -m21 * m32 * m43 +
m21 * m33 * m42 +
m31 * m22 * m43 -
m31 * m23 * m42 -
m41 * m22 * m33 +
m41 * m23 * m32;
inv[13] = m11 * m32 * m43 -
m11 * m33 * m42 -
m31 * m12 * m43 +
m31 * m13 * m42 +
m41 * m12 * m33 -
m41 * m13 * m32;
inv[14] = -m11 * m22 * m43 +
m11 * m23 * m42 +
m21 * m12 * m43 -
m21 * m13 * m42 -
m41 * m12 * m23 +
m41 * m13 * m22;
inv[15] = m11 * m22 * m33 -
m11 * m23 * m32 -
m21 * m12 * m33 +
m21 * m13 * m32 +
m31 * m12 * m23 -
m31 * m13 * m22;
T invDet = T(1.0) / det;
for(unsigned int i = 0; i < 16; ++i)
inv[i] *= invDet;
*dest = inv;
return true;
}
template<typename T>
constexpr bool Mat4<T>::GetInverseTransform(Mat4* dest) const
{
Assert(dest, "destination matrix must be valid");
T det = GetDeterminantTransform();
if(det == T(0.0))
return false;
// http://stackoverflow.com/questions/1148309/inverting-a-4x4-matrix
T inv[16];
inv[0] = m22 * m33 -
m32 * m23;
inv[1] = -m12 * m33 +
m32 * m13;
inv[2] = m12 * m23 -
m22 * m13;
inv[3] = T(0.0);
inv[4] = -m21 * m33 +
m31 * m23;
inv[5] = m11 * m33 -
m31 * m13;
inv[6] = -m11 * m23 +
m21 * m13;
inv[7] = T(0.0);
inv[8] = m21 * m32 -
m31 * m22;
inv[9] = -m11 * m32 +
m31 * m12;
inv[10] = m11 * m22 -
m21 * m12;
inv[11] = T(0.0);
inv[12] = -m21 * m32 * m43 +
m21 * m33 * m42 +
m31 * m22 * m43 -
m31 * m23 * m42 -
m41 * m22 * m33 +
m41 * m23 * m32;
inv[13] = m11 * m32 * m43 -
m11 * m33 * m42 -
m31 * m12 * m43 +
m31 * m13 * m42 +
m41 * m12 * m33 -
m41 * m13 * m32;
inv[14] = -m11 * m22 * m43 +
m11 * m23 * m42 +
m21 * m12 * m43 -
m21 * m13 * m42 -
m41 * m12 * m23 +
m41 * m13 * m22;
T invDet = T(1.0) / det;
for(unsigned int i = 0; i < 16; ++i)
inv[i] *= invDet;
inv[15] = T(1.0);
*dest = inv;
return true;
}
template<typename T>
Quat<T> Mat4<T>::GetRotation() const
{
// http://www.euclideanspace.com/maths/geometry/rotations/conversions/matrixToQuat/
Quat<T> quat;
T trace = m11 + m22 + m33;
if(trace > T(0.0))
{
T s = T(0.5) / std::sqrt(trace + T(1.0));
quat.w = T(0.25) / s;
quat.x = (m23 - m32) * s;
quat.y = (m31 - m13) * s;
quat.z = (m12 - m21) * s;
}
else
{
if(m11 > m22 && m11 > m33)
{
T s = T(2.0) * std::sqrt(T(1.0) + m11 - m22 - m33);
quat.w = (m23 - m32) / s;
quat.x = T(0.25) * s;
quat.y = (m21 + m12) / s;
quat.z = (m31 + m13) / s;
}
else if(m22 > m33)
{
T s = T(2.0) * std::sqrt(T(1.0) + m22 - m11 - m33);
quat.w = (m31 - m13) / s;
quat.x = (m21 + m12) / s;
quat.y = T(0.25) * s;
quat.z = (m32 + m23) / s;
}
else
{
T s = T(2.0) * std::sqrt(T(1.0) + m33 - m11 - m22);
quat.w = (m12 - m21) / s;
quat.x = (m31 + m13) / s;
quat.y = (m32 + m23) / s;
quat.z = T(0.25) * s;
}
}
return quat;
}
template<typename T>
constexpr Vec4<T> Mat4<T>::GetRow(std::size_t row) const
{
Assert(row < 4, "row index out of range");
const T* ptr = &m11;
return Vec4<T>(ptr[row], ptr[row+4], ptr[row+8], ptr[row+12]);
}
template<typename T>
constexpr Vec3<T> Mat4<T>::GetScale() const
{
Vec3<T> squaredScale = GetSquaredScale();
return Vec3<T>(std::sqrt(squaredScale.x), std::sqrt(squaredScale.y), std::sqrt(squaredScale.z));
}
template<typename T>
constexpr Vec3<T> Mat4<T>::GetSquaredScale() const
{
return Vec3<T>(m11 * m11 + m12 * m12 + m13 * m13,
m21 * m21 + m22 * m22 + m23 * m23,
m31 * m31 + m32 * m32 + m33 * m33);
}
template<typename T>
constexpr Vec3<T> Mat4<T>::GetTranslation() const
{
return Vec3<T>(m41, m42, m43);
}
template<typename T>
constexpr void Mat4<T>::GetTransposed(Mat4* dest) const
{
(*dest) = Mat4f(
m11, m21, m31, m41,
m12, m22, m32, m42,
m13, m23, m33, m43,
m14, m24, m34, m44
);
}
template<typename T>
constexpr bool Mat4<T>::HasNegativeScale() const
{
return GetDeterminant() < T(0.0);
}
template<typename T>
constexpr bool Mat4<T>::HasScale() const
{
T t = m11*m11 + m21*m21 + m31*m31;
if(!NumberEquals(t, T(1.0)))
return true;
t = m12*m12 + m22*m22 + m32*m32;
if(!NumberEquals(t, T(1.0)))
return true;
t = m13*m13 + m23*m23 + m33*m33;
if(!NumberEquals(t, T(1.0)))
return true;
return false;
}
template<typename T>
constexpr Mat4<T>& Mat4<T>::Inverse(bool* succeeded)
{
bool result = GetInverse(this);
if(succeeded)
*succeeded = result;
return *this;
}
template<typename T>
constexpr Mat4<T>& Mat4<T>::InverseTransform(bool* succeeded)
{
bool result = GetInverseTransform(this);
if(succeeded)
*succeeded = result;
return *this;
}
template<typename T>
constexpr bool Mat4<T>::IsTransformMatrix() const
{
return NumberEquals(m14, T(0.0)) && NumberEquals(m24, T(0.0)) && NumberEquals(m34, T(0.0)) && NumberEquals(m44, T(1.0));
}
template<typename T>
constexpr bool Mat4<T>::IsIdentity() const
{
return (NumberEquals(m11, T(1.0)) && NumberEquals(m12, T(0.0)) && NumberEquals(m13, T(0.0)) && NumberEquals(m14, T(0.0)) &&
NumberEquals(m21, T(0.0)) && NumberEquals(m22, T(1.0)) && NumberEquals(m23, T(0.0)) && NumberEquals(m24, T(0.0)) &&
NumberEquals(m31, T(0.0)) && NumberEquals(m32, T(0.0)) && NumberEquals(m33, T(1.0)) && NumberEquals(m34, T(0.0)) &&
NumberEquals(m41, T(0.0)) && NumberEquals(m42, T(0.0)) && NumberEquals(m43, T(0.0)) && NumberEquals(m44, T(1.0)));
}
template<typename T>
constexpr Mat4<T>& Mat4<T>::SetRotation(const Quat<T>& rotation)
{
T qw = rotation.w;
T qx = rotation.x;
T qy = rotation.y;
T qz = rotation.z;
T qx2 = qx * qx;
T qy2 = qy * qy;
T qz2 = qz * qz;
m11 = T(1.0) - T(2.0) * qy2 - T(2.0) * qz2;
m21 = T(2.0) * qx * qy - T(2.0) * qz * qw;
m31 = T(2.0) * qx * qz + T(2.0) * qy * qw;
m12 = T(2.0) * qx * qy + T(2.0) * qz * qw;
m22 = T(1.0) - T(2.0) * qx2 - T(2.0) * qz2;
m32 = T(2.0) * qy * qz - T(2.0) * qx * qw;
m13 = T(2.0) * qx * qz - T(2.0) * qy * qw;
m23 = T(2.0) * qy * qz + T(2.0) * qx * qw;
m33 = T(1.0) - T(2.0) * qx2 - T(2.0) * qy2;
return *this;
}
template<typename T>
constexpr Mat4<T>& Mat4<T>::SetScale(const Vec3<T>& scale)
{
m11 = scale.x;
m22 = scale.y;
m33 = scale.z;
return *this;
}
template<typename T>
constexpr Mat4<T>& Mat4<T>::SetTranslation(const Vec3<T>& translation)
{
m41 = translation.x;
m42 = translation.y;
m43 = translation.z;
return *this;
}
template<typename T>
std::string Mat4<T>::ToString() const
{
std::ostringstream ss;
ss << *this;
return ss.str();
}
template<typename T>
constexpr Vec2<T> Mat4<T>::Transform(const Vec2<T>& vector, T z, T w) const
{
return Vec2<T>(m11 * vector.x + m21 * vector.y + m31 * z + m41 * w,
m12 * vector.x + m22 * vector.y + m32 * z + m42 * w);
}
template<typename T>
constexpr Vec3<T> Mat4<T>::Transform(const Vec3<T>& vector, T w) const
{
return Vec3<T>(m11 * vector.x + m21 * vector.y + m31 * vector.z + m41 * w,
m12 * vector.x + m22 * vector.y + m32 * vector.z + m42 * w,
m13 * vector.x + m23 * vector.y + m33 * vector.z + m43 * w);
}
template<typename T>
constexpr Vec4<T> Mat4<T>::Transform(const Vec4<T>& vector) const
{
return Vec4<T>(m11 * vector.x + m21 * vector.y + m31 * vector.z + m41 * vector.w,
m12 * vector.x + m22 * vector.y + m32 * vector.z + m42 * vector.w,
m13 * vector.x + m23 * vector.y + m33 * vector.z + m43 * vector.w,
m14 * vector.x + m24 * vector.y + m34 * vector.z + m44 * vector.w);
}
template<typename T>
constexpr Mat4<T>& Mat4<T>::Transpose()
{
std::swap(m12, m21);
std::swap(m13, m31);
std::swap(m14, m41);
std::swap(m23, m32);
std::swap(m24, m42);
std::swap(m34, m43);
return *this;
}
template<typename T>
constexpr T& Mat4<T>::operator()(std::size_t x, std::size_t y)
{
Assert(x <= 3, "index out of range");
Assert(y <= 3, "index out of range");
return (&m11)[y*4 + x];
}
template<typename T>
constexpr const T& Mat4<T>::operator()(std::size_t x, std::size_t y) const
{
Assert(x <= 3, "index out of range");
Assert(y <= 3, "index out of range");
return (&m11)[y*4+x];
}
template<typename T>
constexpr T& Mat4<T>::operator[](std::size_t i)
{
Assert(i <= 16, "index out of range");
return (&m11)[i];
}
template<typename T>
constexpr const T& Mat4<T>::operator[](std::size_t i) const
{
Assert(i <= 16, "index out of range");
return (&m11)[i];
}
template<typename T>
constexpr Mat4<T> Mat4<T>::operator*(const Mat4& matrix) const
{
Mat4 result(*this);
return result.Concatenate(matrix);
}
template<typename T>
constexpr Vec2<T> Mat4<T>::operator*(const Vec2<T>& vector) const
{
return Transform(vector);
}
template<typename T>
constexpr Vec3<T> Mat4<T>::operator*(const Vec3<T>& vector) const
{
return Transform(vector);
}
template<typename T>
constexpr Vec4<T> Mat4<T>::operator*(const Vec4<T>& vector) const
{
return Transform(vector);
}
template<typename T>
constexpr Mat4<T> Mat4<T>::operator*(T scalar) const
{
Mat4 mat;
for(unsigned int i = 0; i < 16; ++i)
mat[i] = (&m11)[i] * scalar;
return mat;
}
template<typename T>
constexpr Mat4<T>& Mat4<T>::operator*=(const Mat4& matrix)
{
Concatenate(matrix);
return *this;
}
template<typename T>
constexpr Mat4<T>& Mat4<T>::operator*=(T scalar)
{
for(unsigned int i = 0; i < 16; ++i)
(&m11)[i] *= scalar;
return *this;
}
template<typename T>
constexpr bool Mat4<T>::operator==(const Mat4& mat) const
{
for(unsigned int i = 0; i < 16; ++i)
if((&m11)[i] != (&mat.m11)[i])
return false;
return true;
}
template<typename T>
constexpr bool Mat4<T>::operator!=(const Mat4& mat) const
{
return !operator==(mat);
}
template<typename T>
constexpr bool Mat4<T>::ApproxEqual(const Mat4& lhs, const Mat4& rhs, T maxDifference)
{
return lhs.ApproxEqual(rhs, maxDifference);
}
template<typename T>
constexpr Mat4<T> Mat4<T>::Concatenate(const Mat4& left, const Mat4& right)
{
Mat4 matrix(left); // Copy of left-hand side matrix
matrix.Concatenate(right); // Concatenation with right-hand side
return matrix;
}
template<typename T>
constexpr Mat4<T> Mat4<T>::ConcatenateTransform(const Mat4& left, const Mat4& right)
{
Mat4 matrix(left); // Copy of left-hand side matrix
matrix.ConcatenateTransform(right); // Affine concatenation with right-hand side
return matrix;
}
template<typename T>
constexpr Mat4<T> Mat4<T>::Identity()
{
return Mat4(
T(1.0), T(0.0), T(0.0), T(0.0),
T(0.0), T(1.0), T(0.0), T(0.0),
T(0.0), T(0.0), T(1.0), T(0.0),
T(0.0), T(0.0), T(0.0), T(1.0)
);
}
template<typename T>
constexpr Mat4<T> Mat4<T>::LookAt(const Vec3<T>& eye, const Vec3<T>& target, const Vec3<T>& up)
{
Vec3<T> f = Vec3<T>::Normalize(target - eye);
Vec3<T> s = Vec3<T>::Normalize(f.CrossProduct(up));
Vec3<T> u = s.CrossProduct(f);
return Mat4(
s.x, u.x, -f.x, T(0.0),
s.y, u.y, -f.y, T(0.0),
s.z, u.z, -f.z, T(0.0),
-s.DotProduct(eye), -u.DotProduct(eye), f.DotProduct(eye), T(1.0)
);
}
template<typename T>
constexpr Mat4<T> Mat4<T>::Ortho(T left, T right, T top, T bottom, T zNear, T zFar)
{
// http://msdn.microsoft.com/en-us/library/windows/desktop/bb204942(v=vs.85).aspx
return Mat4(
T(2.0) / (right - left), T(0.0), T(0.0), T(0.0),
T(0.0), T(2.0) / (top - bottom), T(0.0), T(0.0),
T(0.0), T(0.0), T(1.0) / (zNear - zFar), T(0.0),
(left + right) / (left - right), (top + bottom) / (bottom - top), zNear / (zNear - zFar), T(1.0)
);
}
template<typename T>
Mat4<T> Mat4<T>::Perspective(RadianAngle<T> angle, T ratio, T zNear, T zFar)
{
angle /= T(2.0);
T yScale = angle.GetTan();
return Mat4(
T(1.0) / (ratio * yScale), T(0.0), T(0.0), T(0.0),
T(0.0), T(-1.0) / (yScale), T(0.0), T(0.0),
T(0.0), T(0.0), zFar / (zNear - zFar), T(-1.0),
T(0.0), T(0.0), -(zNear * zFar) / (zFar - zNear), T(0.0)
);
}
template<typename T>
constexpr Mat4<T> Mat4<T>::Rotate(const Quat<T>& rotation)
{
Mat4 matrix = Mat4::Identity();
matrix.SetRotation(rotation);
return matrix;
}
template<typename T>
constexpr Mat4<T> Mat4<T>::Scale(const Vec3<T>& scale)
{
return Mat4(
scale.x, T(0.0), T(0.0), T(0.0),
T(0.0), scale.y, T(0.0), T(0.0),
T(0.0), T(0.0), scale.z, T(0.0),
T(0.0), T(0.0), T(0.0), T(1.0)
);
}
template<typename T>
constexpr Mat4<T> Mat4<T>::Translate(const Vec3<T>& translation)
{
return Mat4(
T(1.0), T(0.0), T(0.0), T(0.0),
T(0.0), T(1.0), T(0.0), T(0.0),
T(0.0), T(0.0), T(1.0), T(0.0),
translation.x, translation.y, translation.z, T(1.0)
);
}
template<typename T>
constexpr Mat4<T> Mat4<T>::Transform(const Vec3<T>& translation, const Quat<T>& rotation)
{
Mat4 mat = Mat4f::Identity();
mat.SetRotation(rotation);
mat.SetTranslation(translation);
return mat;
}
template<typename T>
constexpr Mat4<T> Mat4<T>::Transform(const Vec3<T>& translation, const Quat<T>& rotation, const Vec3<T>& scale)
{
Mat4 mat = Transform(translation, rotation);
mat.ApplyScale(scale);
return mat;
}
template<typename T>
constexpr Mat4<T> Mat4<T>::TransformInverse(const Vec3<T>& translation, const Quat<T>& rotation)
{
// A view matrix must apply an inverse transformation of the 'world' matrix
Quat<T> invRot = rotation.GetConjugate(); // Inverse of the rotation
return Transform(-(invRot * translation), invRot);
}
template<typename T>
constexpr Mat4<T> Mat4<T>::TransformInverse(const Vec3<T>& translation, const Quat<T>& rotation, const Vec3<T>& scale)
{
return TransformInverse(translation, rotation).ApplyScale(T(1.0) / scale);
}
template<typename T>
constexpr Mat4<T> Mat4<T>::Zero()
{
return Mat4(
T(0.0), T(0.0), T(0.0), T(0.0),
T(0.0), T(0.0), T(0.0), T(0.0),
T(0.0), T(0.0), T(0.0), T(0.0),
T(0.0), T(0.0), T(0.0), T(0.0)
);
}
template<typename T>
std::ostream& operator<<(std::ostream& out, const Mat4<T>& matrix)
{
return out << "Mat4(" << matrix.m11 << ", " << matrix.m12 << ", " << matrix.m13 << ", " << matrix.m14 << ",\n"
<< " " << matrix.m21 << ", " << matrix.m22 << ", " << matrix.m23 << ", " << matrix.m24 << ",\n"
<< " " << matrix.m31 << ", " << matrix.m32 << ", " << matrix.m33 << ", " << matrix.m34 << ",\n"
<< " " << matrix.m41 << ", " << matrix.m42 << ", " << matrix.m43 << ", " << matrix.m44 << ')';
}
template<typename T>
constexpr Mat4<T> operator*(T scale, const Mat4<T>& matrix)
{
return matrix * scale;
}
}
+24
View File
@@ -0,0 +1,24 @@
#ifndef __MLX_MATHS_UTILS__
#define __MLX_MATHS_UTILS__
namespace mlx
{
template<typename T>
[[nodiscard]] constexpr T Mod(T x, T y) noexcept;
template<std::floating_point T>
[[nodiscard]] constexpr T DegreeToRadian(T degrees) noexcept;
template<std::floating_point T>
[[nodiscard]] constexpr T RadianToDegree(T radians) noexcept;
template<typename T>
[[nodiscard]] constexpr T Clamp(T value, T min, T max) noexcept;
template<typename T, typename T2>
[[nodiscard]] constexpr T Lerp(const T& from, const T& to, const T2& interpolation) noexcept;
}
#include <Maths/MathsUtils.inl>
#endif
+44
View File
@@ -0,0 +1,44 @@
#pragma once
#include <Maths/MathsUtils.h>
#include <Maths/Constants.h>
namespace mlx
{
template<typename T>
[[nodiscard]] constexpr T Mod(T x, T y) noexcept
{
if constexpr(std::is_floating_point_v<T>)
{
if(!std::is_constant_evaluated())
return x - static_cast<long long>(x / y) * y;
else
return std::fmod(x, y);
}
return x % y;
}
template<std::floating_point T>
[[nodiscard]] constexpr T DegreeToRadian(T degrees) noexcept
{
return degrees * (Pi<T>() / T(180.0));
}
template<std::floating_point T>
[[nodiscard]] constexpr T RadianToDegree(T radians) noexcept
{
return radians * (T(180.0) / Pi<T>());
}
template<typename T>
[[nodiscard]] constexpr T Clamp(T value, T min, T max) noexcept
{
return std::max(std::min(value, max), min);
}
template<typename T, typename T2>
[[nodiscard]] constexpr T Lerp(const T& from, const T& to, const T2& interpolation) noexcept
{
return static_cast<T>(from + interpolation * (to - from));
}
}
+92
View File
@@ -0,0 +1,92 @@
#ifndef __MLX_QUATERNIONS__
#define __MLX_QUATERNIONS__
#include <Maths/Angles.h>
#include <Maths/Vec3.h>
namespace mlx
{
template<typename T>
struct Quat
{
T w, x, y, z;
constexpr Quat() = default;
constexpr Quat(T W, T X, T Y, T Z);
template<AngleUnit Unit> Quat(const Angle<Unit, T>& angle);
Quat(const EulerAngles<T>& angles);
constexpr Quat(RadianAngle<T> angle, const Vec3<T>& axis);
constexpr Quat(const T quat[4]);
template<typename U> constexpr explicit Quat(const Quat<U>& quat);
constexpr Quat(const Quat&) = default;
constexpr Quat(Quat&&) = default;
RadianAngle<T> AngleBetween(const Quat& vec) const;
constexpr bool ApproxEqual(const Quat& quat, T max_difference = std::numeric_limits<T>::epsilon()) const;
Quat& ComputeW();
constexpr Quat& Conjugate();
constexpr T DotProduct(const Quat& vec) const;
constexpr Quat GetConjugate() const;
Quat GetInverse() const;
Quat GetNormal(T* length = nullptr) const;
Quat& Inverse();
T Magnitude() const;
Quat& Normalize(T* length = nullptr);
constexpr T SquaredMagnitude() const;
RadianAngle<T> To2DAngle() const;
EulerAngles<T> ToEulerAngles() const;
std::string ToString() const;
constexpr Quat& operator=(const Quat& quat) = default;
constexpr Quat& operator=(Quat&&) = default;
constexpr Quat operator+(const Quat& quat) const;
constexpr Quat operator*(const Quat& quat) const;
constexpr Vec3<T> operator*(const Vec3<T>& vec) const;
constexpr Quat operator*(T scale) const;
constexpr Quat operator/(const Quat& quat) const;
constexpr Quat& operator+=(const Quat& quat);
constexpr Quat& operator*=(const Quat& quat);
constexpr Quat& operator*=(T scale);
constexpr Quat& operator/=(const Quat& quat);
constexpr bool operator==(const Quat& quat) const;
constexpr bool operator!=(const Quat& quat) const;
constexpr bool operator<(const Quat& quat) const;
constexpr bool operator<=(const Quat& quat) const;
constexpr bool operator>(const Quat& quat) const;
constexpr bool operator>=(const Quat& quat) const;
static RadianAngle<T> AngleBetween(const Quat& lhs, const Quat& rhs);
static constexpr bool ApproxEqual(const Quat& lhs, const Quat& rhs, T max_difference = std::numeric_limits<T>::epsilon());
static constexpr Quat Identity();
static constexpr Quat Lerp(const Quat& from, const Quat& to, T interpolation);
static Quat LookAt(const Vec3<T>& forward, const Vec3<T>& up);
static Quat Normalize(const Quat& quat, T* length = nullptr);
static Quat RotationBetween(const Vec3<T>& from, const Vec3<T>& to);
static Quat RotateTowards(const Quat& from, const Quat& to, RadianAngle<T> max_rotation);
static Quat Mirror(Quat quat, const Vec3<T>& axis);
static Quat Slerp(const Quat& from, const Quat& to, T interpolation);
static constexpr Quat Zero();
~Quat() = default;
};
using Quatd = Quat<double>;
using Quatf = Quat<float>;
template<typename T> std::ostream& operator<<(std::ostream& out, const Quat<T>& quat);
}
#include <Maths/Quaternions.inl>
#endif
+508
View File
@@ -0,0 +1,508 @@
#pragma once
#include <Maths/Quaternions.h>
namespace mlx
{
template<typename T>
constexpr Quat<T>::Quat(T W, T X, T Y, T Z) : w(W), x(X), y(Y), z(Z)
{}
template<typename T>
template<AngleUnit Unit>
Quat<T>::Quat(const Angle<Unit, T>& angle) : Quat(angle.ToQuat())
{}
template<typename T>
Quat<T>::Quat(const EulerAngles<T>& angles) : Quat(angles.ToQuat())
{}
template<typename T>
constexpr Quat<T>::Quat(RadianAngle<T> angle, const Vec3<T>& axis)
{
angle /= T(2.0);
Vec3<T> normalizedAxis = axis.GetNormal();
auto sincos = angle.GetSinCos();
w = sincos.second;
x = normalizedAxis.x * sincos.first;
y = normalizedAxis.y * sincos.first;
z = normalizedAxis.z * sincos.first;
Normalize();
}
template<typename T>
constexpr Quat<T>::Quat(const T quat[4]) : w(quat[0]), x(quat[1]), y(quat[2]), z(quat[3])
{}
template<typename T>
template<typename U>
constexpr Quat<T>::Quat(const Quat<U>& quat) : w(static_cast<T>(quat.w)), x(static_cast<T>(quat.x)), y(static_cast<T>(quat.y)), z(static_cast<T>(quat.z))
{}
template<typename T>
RadianAngle<T> Quat<T>::AngleBetween(const Quat& quat) const
{
T alpha = Vec3<T>::DotProduct(Vec3<T>(x, y, z), Vec3<T>(quat.x, quat.y, quat.z));
return std::acos(mlx::Clamp(alpha, T(-1.0), T(1.0)));
}
template<typename T>
constexpr bool Quat<T>::ApproxEqual(const Quat& quat, T maxDifference) const
{
return NumberEquals(w, quat.w, maxDifference) &&
NumberEquals(x, quat.x, maxDifference) &&
NumberEquals(y, quat.y, maxDifference) &&
NumberEquals(z, quat.z, maxDifference);
}
template<typename T>
Quat<T>& Quat<T>::ComputeW()
{
T t = T(1.0) - SquaredMagnitude();
if(t < T(0.0))
w = T(0.0);
else
w = -std::sqrt(t);
return *this;
}
template<typename T>
constexpr Quat<T>& Quat<T>::Conjugate()
{
x = -x;
y = -y;
z = -z;
return *this;
}
template<typename T>
constexpr T Quat<T>::DotProduct(const Quat& quat) const
{
return w * quat.w + x * quat.x + y * quat.y + z * quat.z;
}
template<typename T>
constexpr Quat<T> Quat<T>::GetConjugate() const
{
Quat<T> quat(*this);
quat.Conjugate();
return quat;
}
template<typename T>
Quat<T> Quat<T>::GetInverse() const
{
Quat<T> quat(*this);
quat.Inverse();
return quat;
}
template<typename T>
Quat<T> Quat<T>::GetNormal(T* length) const
{
Quat<T> quat(*this);
quat.Normalize(length);
return quat;
}
template<typename T>
Quat<T>& Quat<T>::Inverse()
{
T norm = SquaredMagnitude();
if(norm > T(0.0))
{
T invNorm = T(1.0) / std::sqrt(norm);
w *= invNorm;
x *= -invNorm;
y *= -invNorm;
z *= -invNorm;
}
return *this;
}
template<typename T>
T Quat<T>::Magnitude() const
{
return std::sqrt(SquaredMagnitude());
}
template<typename T>
Quat<T>& Quat<T>::Normalize(T* length)
{
T norm = std::sqrt(SquaredMagnitude());
if(norm > T(0.0))
{
T invNorm = T(1.0) / norm;
w *= invNorm;
x *= invNorm;
y *= invNorm;
z *= invNorm;
}
if(length)
*length = norm;
return *this;
}
template<typename T>
constexpr T Quat<T>::SquaredMagnitude() const
{
return w * w + x * x + y * y + z * z;
}
template<typename T>
RadianAngle<T> Quat<T>::To2DAngle() const
{
T siny_cosp = T(2.0) * (w * z + x * y);
T cosy_cosp = T(1.0) - T(2.0) * (y * y + z * z);
return std::atan2(siny_cosp, cosy_cosp);
}
template<typename T>
EulerAngles<T> Quat<T>::ToEulerAngles() const
{
T test = x * y + z * w;
if(test > T(0.499))
// singularity at north pole
return EulerAngles<T>(DegreeAngle<T>(T(0.0)), RadianAngle<T>(T(2.0) * std::atan2(x, w)), DegreeAngle<T>(T(90.0)));
if(test < T(-0.499))
// singularity at south pole
return EulerAngles<T>(DegreeAngle<T>(T(0.0)), RadianAngle<T>(T(-2.0) * std::atan2(x, w)), DegreeAngle<T>(T(-90.0)));
return EulerAngles<T>(RadianAngle<T>(std::atan2(T(2.0) * x * w - T(2.0) * y * z, T(1.0) - T(2.0) * x * x - T(2.0) * z * z)),
RadianAngle<T>(std::atan2(T(2.0) * y * w - T(2.0) * x * z, T(1.0) - T(2.0) * y * y - T(2.0) * z * z)),
RadianAngle<T>(std::asin(T(2.0) * test)));
}
template<typename T>
std::string Quat<T>::ToString() const
{
std::ostringstream ss;
ss << *this;
return ss.str();
}
template<typename T>
constexpr Quat<T> Quat<T>::operator+(const Quat& quat) const
{
Quat result;
result.w = w + quat.w;
result.x = x + quat.x;
result.y = y + quat.y;
result.z = z + quat.z;
return result;
}
template<typename T>
constexpr Quat<T> Quat<T>::operator*(const Quat& quat) const
{
Quat result;
result.w = w * quat.w - x * quat.x - y * quat.y - z * quat.z;
result.x = w * quat.x + x * quat.w + y * quat.z - z * quat.y;
result.y = w * quat.y + y * quat.w + z * quat.x - x * quat.z;
result.z = w * quat.z + z * quat.w + x * quat.y - y * quat.x;
return result;
}
template<typename T>
constexpr Vec3<T> Quat<T>::operator*(const Vec3<T>& vec) const
{
Vec3<T> quatVec(x, y, z);
Vec3<T> uv = quatVec.CrossProduct(vec);
Vec3<T> uuv = quatVec.CrossProduct(uv);
uv *= T(2.0) * w;
uuv *= T(2.0);
return vec + uv + uuv;
}
template<typename T>
constexpr Quat<T> Quat<T>::operator*(T scale) const
{
return Quat(w * scale,
x * scale,
y * scale,
z * scale);
}
template<typename T>
constexpr Quat<T> Quat<T>::operator/(const Quat& quat) const
{
return quat.GetConjugate() * (*this);
}
template<typename T>
constexpr Quat<T>& Quat<T>::operator+=(const Quat& quat)
{
return operator=(operator+(quat));
}
template<typename T>
constexpr Quat<T>& Quat<T>::operator*=(const Quat& quat)
{
return operator=(operator*(quat));
}
template<typename T>
constexpr Quat<T>& Quat<T>::operator*=(T scale)
{
return operator=(operator*(scale));
}
template<typename T>
constexpr Quat<T>& Quat<T>::operator/=(const Quat& quat)
{
return operator=(operator/(quat));
}
template<typename T>
constexpr bool Quat<T>::operator==(const Quat& quat) const
{
return w == quat.w && x == quat.x && y == quat.y && z == quat.z;
}
template<typename T>
constexpr bool Quat<T>::operator!=(const Quat& quat) const
{
return !operator==(quat);
}
template<typename T>
constexpr bool Quat<T>::operator<(const Quat& quat) const
{
if(w != quat.w)
return w < quat.w;
if(x != quat.x)
return x < quat.x;
if(y != quat.y)
return y < quat.y;
if(z != quat.z)
return z < quat.z;
}
template<typename T>
constexpr bool Quat<T>::operator<=(const Quat& quat) const
{
if(w != quat.w)
return w < quat.w;
if(x != quat.x)
return x < quat.x;
if(y != quat.y)
return y < quat.y;
if(z != quat.z)
return z <= quat.z;
}
template<typename T>
constexpr bool Quat<T>::operator>(const Quat& quat) const
{
if(w != quat.w)
return w > quat.w;
if(x != quat.x)
return x > quat.x;
if(y != quat.y)
return y > quat.y;
if(z != quat.z)
return z > quat.z;
}
template<typename T>
constexpr bool Quat<T>::operator>=(const Quat& quat) const
{
if(w != quat.w)
return w > quat.w;
if(x != quat.x)
return x > quat.x;
if(y != quat.y)
return y > quat.y;
if(z != quat.z)
return z >= quat.z;
}
template<typename T>
RadianAngle<T> Quat<T>::AngleBetween(const Quat& lhs, const Quat& rhs)
{
return lhs.AngleBetween(rhs);
}
template<typename T>
constexpr bool Quat<T>::ApproxEqual(const Quat& lhs, const Quat& rhs, T maxDifference)
{
return lhs.ApproxEqual(rhs, maxDifference);
}
template<typename T>
constexpr Quat<T> Quat<T>::Identity()
{
return Quat(1, 0, 0, 0);
}
template<typename T>
constexpr Quat<T> Quat<T>::Lerp(const Quat& from, const Quat& to, T interpolation)
{
Quat interpolated;
interpolated.w = mlx::Lerp(from.w, to.w, interpolation);
interpolated.x = mlx::Lerp(from.x, to.x, interpolation);
interpolated.y = mlx::Lerp(from.y, to.y, interpolation);
interpolated.z = mlx::Lerp(from.z, to.z, interpolation);
return interpolated;
}
template<typename T>
Quat<T> Quat<T>::LookAt(const Vec3<T>& forward, const Vec3<T>& up)
{
// From https://gamedev.stackexchange.com/questions/53129/quaternion-look-at-with-up-vector
Vec3<T> forward_w = Vec3<T>::Forward();
Vec3<T> axis = Vec3<T>::CrossProduct(forward, forward_w);
RadianAngle<T> angle = std::acos(Vec3<T>::DotProduct(forward, forward_w));
Vec3<T> third = Vec3<T>::CrossProduct(axis, forward_w);
if(Vec3<T>::DotProduct(third, forward) < 0)
angle = -angle;
Quat<T> q1 = Quat(angle, axis);
Vec3<T> up_l = q1 * up;
Vec3<T> right = Vec3<T>::Normalize(Vec3<T>::CrossProduct(forward, up));
Vec3<T> up_w = Vec3<T>::Normalize(Vec3<T>::CrossProduct(right, forward));
Vec3<T> axis2 = Vec3<T>::CrossProduct(up_l, up_w);
RadianAngle<T> angle2 = std::acos(Vec3<T>::DotProduct(forward, forward_w));
Quat<T> q2 = Quat(angle2, axis2);
return q2 * q1;
}
template<typename T>
Quat<T> Quat<T>::Normalize(const Quat& quat, T* length)
{
return quat.GetNormal(length);
}
template<typename T>
Quat<T> Quat<T>::RotationBetween(const Vec3<T>& from, const Vec3<T>& to)
{
T dot = from.DotProduct(to);
if(dot < T(-0.999999))
{
Vec3<T> crossProduct;
if(from.DotProduct(Vec3<T>::UnitX()) < T(0.999999))
crossProduct = Vec3<T>::UnitX().CrossProduct(from);
else
crossProduct = Vec3<T>::UnitY().CrossProduct(from);
crossProduct.Normalize();
return Quat(Pi<T>(), crossProduct);
}
else if(dot > T(0.999999))
return Quat::Identity();
else
{
T norm = std::sqrt(from.GetSquaredLength() * to.GetSquaredLength());
Vec3<T> crossProduct = from.CrossProduct(to);
return Quat(norm + dot, crossProduct.x, crossProduct.y, crossProduct.z).GetNormal();
}
}
template<typename T>
Quat<T> Quat<T>::RotateTowards(const Quat& from, const Quat& to, RadianAngle<T> maxRotation)
{
RadianAngle<T> rotationBetween = AngleBetween(from, to);
if(rotationBetween < maxRotation)
return to;
return Slerp(from, to, std::min(maxRotation.value / rotationBetween.value), 1.f);
}
template<typename T>
Quat<T> Quat<T>::Mirror(Quat quat, const Vec3<T>& axis)
{
T x = std::copysign(T(1.0), axis.x);
T y = std::copysign(T(1.0), axis.y);
T z = std::copysign(T(1.0), axis.z);
quat.x = y * z * quat.x;
quat.y = x * z * quat.y;
quat.z = x * y * quat.z;
return quat;
}
template<typename T>
Quat<T> Quat<T>::Slerp(const Quat& from, const Quat& to, T interpolation)
{
Quat q;
T cosOmega = from.DotProduct(to);
if(cosOmega < T(0.0))
{
// We invert everything
q = Quat(-to.w, -to.x, -to.y, -to.z);
cosOmega = -cosOmega;
}
else
q = Quat(to);
T k0, k1;
if(cosOmega > T(0.9999))
{
// Linear interpolation to avoid division by zero
k0 = T(1.0) - interpolation;
k1 = interpolation;
}
else
{
T sinOmega = std::sqrt(T(1.0) - cosOmega*cosOmega);
T omega = std::atan2(sinOmega, cosOmega);
// To avoid two divisions
sinOmega = T(1.0)/sinOmega;
k0 = std::sin((T(1.0) - interpolation) * omega) * sinOmega;
k1 = std::sin(interpolation*omega) * sinOmega;
}
Quat result(k0 * from.w, k0 * from.x, k0 * from.y, k0 * from.z);
return result += q * k1;
}
template<typename T>
constexpr Quat<T> Quat<T>::Zero()
{
return Quat(0, 0, 0, 0);
}
template<typename T>
std::ostream& operator<<(std::ostream& out, const Quat<T>& quat)
{
return out << "Quat(" << quat.w << " | " << quat.x << ", " << quat.y << ", " << quat.z << ')';
}
}
+1
View File
@@ -0,0 +1 @@
Highly inspired by [Nazara Maths library](https://github.com/NazaraEngine/NazaraEngine/tree/main/include/Nazara/Math)
+109
View File
@@ -0,0 +1,109 @@
#ifndef __MLX_VEC2__
#define __MLX_VEC2__
namespace mlx
{
template <typename T> struct Vec3;
template <typename T> struct Vec4;
template <typename T>
struct Vec2
{
union { T x, r, s; };
union { T y, g, t; };
constexpr Vec2() = default;
constexpr Vec2(T X, T Y);
constexpr explicit Vec2(T scale);
template<typename U> constexpr explicit Vec2(const Vec2<U>& vec);
constexpr Vec2(const Vec2&) = default;
constexpr Vec2(Vec2&&) = default;
constexpr explicit Vec2(const Vec3<T>& vec);
constexpr explicit Vec2(const Vec4<T>& vec);
T AbsDotProduct(const Vec2& vec) const;
constexpr bool ApproxEqual(const Vec2& vec, T max_difference = std::numeric_limits<T>::epsilon()) const;
template<typename U = T> U Distance(const Vec2& vec) const;
constexpr T DotProduct(const Vec2& vec) const;
template<typename U = T> T GetLength() const;
Vec2 GetNormal(T* length = nullptr) const;
constexpr T GetSquaredLength() const;
constexpr Vec2& Maximize(const Vec2& vec);
constexpr Vec2& Minimize(const Vec2& vec);
Vec2& Normalize(T* length = nullptr);
constexpr T SquaredDistance(const Vec2& vec) const;
std::string ToString() const;
constexpr T& operator[](std::size_t i);
constexpr T operator[](std::size_t i) const;
constexpr const Vec2& operator+() const;
constexpr Vec2 operator-() const;
constexpr Vec2 operator+(const Vec2& vec) const;
constexpr Vec2 operator-(const Vec2& vec) const;
constexpr Vec2 operator*(const Vec2& vec) const;
constexpr Vec2 operator*(T scale) const;
constexpr Vec2 operator/(const Vec2& vec) const;
constexpr Vec2 operator/(T scale) const;
constexpr Vec2 operator%(const Vec2& vec) const;
constexpr Vec2 operator%(T mod) const;
constexpr Vec2& operator=(const Vec2&) = default;
constexpr Vec2& operator=(Vec2&&) = default;
constexpr Vec2& operator+=(const Vec2& vec);
constexpr Vec2& operator-=(const Vec2& vec);
constexpr Vec2& operator*=(const Vec2& vec);
constexpr Vec2& operator*=(T scale);
constexpr Vec2& operator/=(const Vec2& vec);
constexpr Vec2& operator/=(T scale);
constexpr Vec2& operator%=(const Vec2& vec);
constexpr Vec2& operator%=(T mod);
constexpr bool operator==(const Vec2& vec) const;
constexpr bool operator!=(const Vec2& vec) const;
constexpr bool operator<(const Vec2& vec) const;
constexpr bool operator<=(const Vec2& vec) const;
constexpr bool operator>(const Vec2& vec) const;
constexpr bool operator>=(const Vec2& vec) const;
static constexpr Vec2 Apply(T(*func)(T), const Vec2& vec);
static constexpr bool ApproxEqual(const Vec2& lhs, const Vec2& rhs, T max_difference = std::numeric_limits<T>::epsilon());
template<typename U = T> static U Distance(const Vec2& vec1, const Vec2& vec2);
static constexpr T DotProduct(const Vec2& vec1, const Vec2& vec2);
static constexpr Vec2 Lerp(const Vec2& from, const Vec2& to, T interpolation);
static Vec2 Normalize(const Vec2& vec);
static constexpr Vec2 Unit();
static constexpr Vec2 UnitX();
static constexpr Vec2 UnitY();
static constexpr Vec2 Zero();
~Vec2() = default;
};
using Vec2d = Vec2<double>;
using Vec2f = Vec2<float>;
using Vec2i = Vec2<int>;
using Vec2ui = Vec2<unsigned int>;
using Vec2i32 = Vec2<std::int32_t>;
using Vec2i64 = Vec2<std::int64_t>;
using Vec2ui32 = Vec2<std::uint32_t>;
using Vec2ui64 = Vec2<std::uint64_t>;
template<typename T> std::ostream& operator<<(std::ostream& out, const Vec2<T>& vec);
template<typename T> constexpr Vec2<T> operator*(T scale, const Vec2<T>& vec);
template<typename T> constexpr Vec2<T> operator/(T scale, const Vec2<T>& vec);
template<typename T> constexpr Vec2<T> operator%(T mod, const Vec2<T>& vec);
}
#include <Maths/Vec2.inl>
#endif // __AK_VEC2__
+387
View File
@@ -0,0 +1,387 @@
#pragma once
#include <Maths/Vec2.h>
namespace mlx
{
template<typename T>
constexpr Vec2<T>::Vec2(T X, T Y) : x(X), y(Y) {}
template<typename T>
constexpr Vec2<T>::Vec2(T scale) : x(scale), y(scale) {}
template<typename T>
template<typename U>
constexpr Vec2<T>::Vec2(const Vec2<U>& vec) : x(static_cast<T>(vec.x)), y(static_cast<T>(vec.y)) {}
template<typename T>
constexpr Vec2<T>::Vec2(const Vec3<T>& vec) : x(vec.x), y(vec.y) {}
template<typename T>
constexpr Vec2<T>::Vec2(const Vec4<T>& vec) : x(vec.x), y(vec.y) {}
template<typename T>
T Vec2<T>::AbsDotProduct(const Vec2& vec) const
{
return std::abs(x * vec.x) + std::abs(y * vec.y);
}
template<typename T>
constexpr bool Vec2<T>::ApproxEqual(const Vec2& vec, T maxDifference) const
{
return NumberEquals(x, vec.x, maxDifference) && NumberEquals(y, vec.y, maxDifference);
}
template<typename T>
template<typename U>
U Vec2<T>::Distance(const Vec2& vec) const
{
return static_cast<U>(std::sqrt(SquaredDistance(vec)));
}
template<typename T>
constexpr T Vec2<T>::DotProduct(const Vec2& vec) const
{
return x * vec.x + y * vec.y;
}
template<typename T>
template<typename U>
T Vec2<T>::GetLength() const
{
return static_cast<U>(std::sqrt(static_cast<U>(GetSquaredLength())));
}
template<typename T>
Vec2<T> Vec2<T>::GetNormal(T* length) const
{
Vec2 vec(*this);
vec.Normalize(length);
return vec;
}
template<typename T>
constexpr T Vec2<T>::GetSquaredLength() const
{
return x * x + y * y;
}
template<typename T>
constexpr Vec2<T>& Vec2<T>::Maximize(const Vec2& vec)
{
if(vec.x > x)
x = vec.x;
if(vec.y > y)
y = vec.y;
return *this;
}
template<typename T>
constexpr Vec2<T>& Vec2<T>::Minimize(const Vec2& vec)
{
if(vec.x < x)
x = vec.x;
if(vec.y < y)
y = vec.y;
return *this;
}
template<typename T>
Vec2<T>& Vec2<T>::Normalize(T* length)
{
T norm = GetLength();
if(norm > T(0.0))
{
T invNorm = T(1.0) / norm;
x *= invNorm;
y *= invNorm;
}
if(length)
*length = norm;
return *this;
}
template<typename T>
constexpr T Vec2<T>::SquaredDistance(const Vec2& vec) const
{
return (*this - vec).GetSquaredLength();
}
template<typename T>
std::string Vec2<T>::ToString() const
{
return "Vec2(" + std::to_string(x) + ", " + std::to_string(y) + ')';
}
template<typename T>
constexpr T& Vec2<T>::operator[](std::size_t i)
{
mlx::Assert(i < 2, "index out of range");
return *(&x + i);
}
template<typename T>
constexpr T Vec2<T>::operator[](std::size_t i) const
{
mlx::Assert(i < 2, "index out of range");
return *(&x + i);
}
template<typename T>
constexpr const Vec2<T>& Vec2<T>::operator+() const
{
return *this;
}
template<typename T>
constexpr Vec2<T> Vec2<T>::operator-() const
{
return Vec2(-x, -y);
}
template<typename T>
constexpr Vec2<T> Vec2<T>::operator+(const Vec2& vec) const
{
return Vec2(x + vec.x, y + vec.y);
}
template<typename T>
constexpr Vec2<T> Vec2<T>::operator-(const Vec2& vec) const
{
return Vec2(x - vec.x, y - vec.y);
}
template<typename T>
constexpr Vec2<T> Vec2<T>::operator*(const Vec2& vec) const
{
return Vec2(x * vec.x, y * vec.y);
}
template<typename T>
constexpr Vec2<T> Vec2<T>::operator*(T scale) const
{
return Vec2(x * scale, y * scale);
}
template<typename T>
constexpr Vec2<T> Vec2<T>::operator/(const Vec2& vec) const
{
return Vec2(x / vec.x, y / vec.y);
}
template<typename T>
constexpr Vec2<T> Vec2<T>::operator/(T scale) const
{
return Vec2(x / scale, y / scale);
}
template<typename T>
constexpr Vec2<T> Vec2<T>::operator%(const Vec2& vec) const
{
return Vec2(Mod(x, vec.x), Mod(y, vec.y));
}
template<typename T>
constexpr Vec2<T> Vec2<T>::operator%(T mod) const
{
return Vec2(Mod(x, mod), Mod(y, mod));
}
template<typename T>
constexpr Vec2<T>& Vec2<T>::operator+=(const Vec2& vec)
{
x += vec.x;
y += vec.y;
return *this;
}
template<typename T>
constexpr Vec2<T>& Vec2<T>::operator-=(const Vec2& vec)
{
x -= vec.x;
y -= vec.y;
return *this;
}
template<typename T>
constexpr Vec2<T>& Vec2<T>::operator*=(const Vec2& vec)
{
x *= vec.x;
y *= vec.y;
return *this;
}
template<typename T>
constexpr Vec2<T>& Vec2<T>::operator*=(T scale)
{
x *= scale;
y *= scale;
return *this;
}
template<typename T>
constexpr Vec2<T>& Vec2<T>::operator/=(const Vec2& vec)
{
x /= vec.x;
y /= vec.y;
return *this;
}
template<typename T>
constexpr Vec2<T>& Vec2<T>::operator/=(T scale)
{
x /= scale;
y /= scale;
return *this;
}
template<typename T>
constexpr Vec2<T>& Vec2<T>::operator%=(const Vec2& vec)
{
x = Mod(x, vec.x);
y = Mod(y, vec.y);
return *this;
}
template<typename T>
constexpr Vec2<T>& Vec2<T>::operator%=(T value)
{
x = Mod(x, value);
y = Mod(y, value);
return *this;
}
template<typename T>
constexpr bool Vec2<T>::operator==(const Vec2& vec) const
{
return x == vec.x && y == vec.y;
}
template<typename T>
constexpr bool Vec2<T>::operator!=(const Vec2& vec) const
{
return !operator==(vec);
}
template<typename T>
constexpr bool Vec2<T>::operator<(const Vec2& vec) const
{
if (x != vec.x)
return x < vec.x;
return y < vec.y;
}
template<typename T>
constexpr bool Vec2<T>::operator<=(const Vec2& vec) const
{
if (x != vec.x)
return x < vec.x;
return y <= vec.y;
}
template<typename T>
constexpr bool Vec2<T>::operator>(const Vec2& vec) const
{
if (x != vec.x)
return x > vec.x;
return y > vec.y;
}
template<typename T>
constexpr bool Vec2<T>::operator>=(const Vec2& vec) const
{
if (x != vec.x)
return x > vec.x;
return y >= vec.y;
}
template<typename T>
constexpr Vec2<T> Vec2<T>::Apply(T(*func)(T), const Vec2& vec)
{
return Vec2(func(vec.x), func(vec.y));
}
template<typename T>
constexpr bool Vec2<T>::ApproxEqual(const Vec2& lhs, const Vec2& rhs, T maxDifference)
{
return lhs.ApproxEqual(rhs, maxDifference);
}
template<typename T>
template<typename U>
U Vec2<T>::Distance(const Vec2& vec1, const Vec2& vec2)
{
return vec1.Distance<U>(vec2);
}
template<typename T>
constexpr T Vec2<T>::DotProduct(const Vec2& vec1, const Vec2& vec2)
{
return vec1.DotProduct(vec2);
}
template<typename T>
Vec2<T> Vec2<T>::Normalize(const Vec2& vec)
{
return vec.GetNormal();
}
template<typename T>
constexpr Vec2<T> Vec2<T>::Unit()
{
return Vec2(1, 1);
}
template<typename T>
constexpr Vec2<T> Vec2<T>::UnitX()
{
return Vec2(1, 0);
}
template<typename T>
constexpr Vec2<T> Vec2<T>::UnitY()
{
return Vec2(0, 1);
}
template<typename T>
constexpr Vec2<T> Vec2<T>::Zero()
{
return Vec2(0, 0);
}
template<typename T>
std::ostream& operator<<(std::ostream& out, const Vec2<T>& vec)
{
return out << "Vec2(" << vec.x << ", " << vec.y << ')';
}
template<typename T>
constexpr Vec2<T> operator*(T scale, const Vec2<T>& vec)
{
return Vec2<T>(scale * vec.x, scale * vec.y);
}
template<typename T>
constexpr Vec2<T> operator/(T scale, const Vec2<T>& vec)
{
return Vec2<T>(scale / vec.x, scale / vec.y);
}
template<typename T>
constexpr Vec2<T> operator%(T mod, const Vec2<T>& vec)
{
return Vec2<T>(Mod(mod, vec.x), Mod(mod, vec.y));
}
}
+126
View File
@@ -0,0 +1,126 @@
#ifndef __MLX_VEC3__
#define __MLX_VEC3__
namespace mlx
{
template<typename T> struct Vec2;
template<typename T> struct Vec4;
template<typename T>
struct Vec3
{
union { T x, r, s; };
union { T y, g, t; };
union { T z, b, p; };
constexpr Vec3() = default;
constexpr Vec3(T X, T Y, T Z);
constexpr Vec3(T X, const Vec2<T>& vec);
constexpr explicit Vec3(T scale);
constexpr Vec3(const Vec2<T>& vec, T Z = 0.0);
template<typename U> constexpr explicit Vec3(const Vec3<U>& vec);
constexpr Vec3(const Vec3&) = default;
constexpr Vec3(Vec3&&) = default;
constexpr explicit Vec3(const Vec4<T>& vec);
T AbsDotProduct(const Vec3& vec) const;
constexpr bool ApproxEqual(const Vec3& vec, T max_difference = std::numeric_limits<T>::epsilon()) const;
constexpr Vec3 CrossProduct(const Vec3& vec) const;
template<typename U = T> U Distance(const Vec3& vec) const;
constexpr T DotProduct(const Vec3& vec) const;
Vec3 GetAbs() const;
template<typename U = T> U GetLength() const;
Vec3 GetNormal(T* length = nullptr) const;
constexpr T GetSquaredLength() const;
constexpr Vec3& Maximize(const Vec3& vec);
constexpr Vec3& Minimize(const Vec3& vec);
Vec3& Normalize(T* length = nullptr);
constexpr T SquaredDistance(const Vec3& vec) const;
std::string ToString() const;
constexpr T& operator[](std::size_t i);
constexpr const T& operator[](std::size_t i) const;
constexpr const Vec3& operator+() const;
constexpr Vec3 operator-() const;
constexpr Vec3 operator+(const Vec3& vec) const;
constexpr Vec3 operator-(const Vec3& vec) const;
constexpr Vec3 operator*(const Vec3& vec) const;
constexpr Vec3 operator*(T scale) const;
constexpr Vec3 operator/(const Vec3& vec) const;
constexpr Vec3 operator/(T scale) const;
constexpr Vec3 operator%(const Vec3& vec) const;
constexpr Vec3 operator%(T mod) const;
constexpr Vec3& operator=(const Vec3&) = default;
constexpr Vec3& operator=(Vec3&&) = default;
constexpr Vec3& operator+=(const Vec3& vec);
constexpr Vec3& operator-=(const Vec3& vec);
constexpr Vec3& operator*=(const Vec3& vec);
constexpr Vec3& operator*=(T scale);
constexpr Vec3& operator/=(const Vec3& vec);
constexpr Vec3& operator/=(T scale);
constexpr Vec3& operator%=(const Vec3& vec);
constexpr Vec3& operator%=(T mod);
constexpr bool operator==(const Vec3& vec) const;
constexpr bool operator!=(const Vec3& vec) const;
constexpr bool operator<(const Vec3& vec) const;
constexpr bool operator<=(const Vec3& vec) const;
constexpr bool operator>(const Vec3& vec) const;
constexpr bool operator>=(const Vec3& vec) const;
static constexpr Vec3 Apply(T(*func)(T), const Vec3& vec);
static constexpr bool ApproxEqual(const Vec3& lhs, const Vec3& rhs, T max_difference = std::numeric_limits<T>::epsilon());
static constexpr Vec3 Backward();
static constexpr Vec3 Clamp(const Vec3& vec, const Vec3& min, const Vec3& max);
static constexpr Vec3 CrossProduct(const Vec3& vec1, const Vec3& vec2);
template<typename U = T> static U Distance(const Vec3& vec1, const Vec3& vec2);
static constexpr T DotProduct(const Vec3& vec1, const Vec3& vec2);
static constexpr Vec3 Down();
static constexpr Vec3 Forward();
static constexpr Vec3 Left();
static constexpr Vec3 Max(const Vec3& lhs, const Vec3& rhs);
static constexpr Vec3 Min(const Vec3& lhs, const Vec3& rhs);
static Vec3 Normalize(const Vec3& vec);
static constexpr Vec3 Right();
static constexpr T SquaredDistance(const Vec3& vec1, const Vec3& vec2);
static constexpr Vec3 Unit();
static constexpr Vec3 UnitX();
static constexpr Vec3 UnitY();
static constexpr Vec3 UnitZ();
static constexpr Vec3 Up();
static constexpr Vec3 Zero();
~Vec3() = default;
};
using Vec3b = Vec3<std::uint8_t>;
using Vec3d = Vec3<double>;
using Vec3f = Vec3<float>;
using Vec3i = Vec3<int>;
using Vec3ui = Vec3<unsigned int>;
using Vec3i32 = Vec3<std::int32_t>;
using Vec3i64 = Vec3<std::int64_t>;
using Vec3ui32 = Vec3<std::uint32_t>;
using Vec3ui64 = Vec3<std::uint64_t>;
template<typename T> std::ostream& operator<<(std::ostream& out, const Vec3<T>& vec);
template<typename T> constexpr Vec3<T> operator*(T scale, const Vec3<T>& vec);
template<typename T> constexpr Vec3<T> operator/(T scale, const Vec3<T>& vec);
template<typename T> constexpr Vec3<T> operator%(T scale, const Vec3<T>& vec);
}
#include <Maths/Vec3.inl>
#endif // __AK_VEC3__
+508
View File
@@ -0,0 +1,508 @@
#pragma once
#include <Maths/Vec3.h>
namespace mlx
{
template<typename T>
constexpr Vec3<T>::Vec3(T X, T Y, T Z) : x(X), y(Y), z(Z) {}
template<typename T>
constexpr Vec3<T>::Vec3(T X, const Vec2<T>& vec) : x(X), y(vec.x), z(vec.y) {}
template<typename T>
constexpr Vec3<T>::Vec3(T scale) : x(scale), y(scale), z(scale) {}
template<typename T>
constexpr Vec3<T>::Vec3(const Vec2<T>& vec, T Z) : x(vec.x), y(vec.y), z(Z) {}
template<typename T>
template<typename U>
constexpr Vec3<T>::Vec3(const Vec3<U>& vec) : x(static_cast<T>(vec.x)), y(static_cast<T>(vec.y)), z(static_cast<T>(vec.z)) {}
template<typename T>
constexpr Vec3<T>::Vec3(const Vec4<T>& vec) : x(vec.x), y(vec.y), z(vec.z) {}
template<typename T>
T Vec3<T>::AbsDotProduct(const Vec3& vec) const
{
return std::abs(x * vec.x) + std::abs(y * vec.y) + std::abs(z * vec.z);
}
template<typename T>
constexpr bool Vec3<T>::ApproxEqual(const Vec3& vec, T maxDifference) const
{
return NumberEquals(x, vec.x, maxDifference) && NumberEquals(y, vec.y, maxDifference) && NumberEquals(z, vec.z, maxDifference);
}
template<typename T>
constexpr Vec3<T> Vec3<T>::CrossProduct(const Vec3& vec) const
{
return Vec3(y * vec.z - z * vec.y, z * vec.x - x * vec.z, x * vec.y - y * vec.x);
}
template<typename T>
template<typename U>
U Vec3<T>::Distance(const Vec3& vec) const
{
return static_cast<U>(std::sqrt(static_cast<U>(SquaredDistance(vec))));
}
template<typename T>
constexpr T Vec3<T>::DotProduct(const Vec3& vec) const
{
return x * vec.x + y * vec.y + z * vec.z;
}
template<typename T>
Vec3<T> Vec3<T>::GetAbs() const
{
return Vec3(std::abs(x), std::abs(y), std::abs(z));
}
template<typename T>
template<typename U>
U Vec3<T>::GetLength() const
{
return static_cast<U>(std::sqrt(static_cast<U>(GetSquaredLength())));
}
template<typename T>
Vec3<T> Vec3<T>::GetNormal(T* length) const
{
Vec3 vec(*this);
vec.Normalize(length);
return vec;
}
template<typename T>
constexpr T Vec3<T>::GetSquaredLength() const
{
return x*x + y*y + z*z;
}
template<typename T>
constexpr Vec3<T>& Vec3<T>::Maximize(const Vec3& vec)
{
if (vec.x > x)
x = vec.x;
if (vec.y > y)
y = vec.y;
if (vec.z > z)
z = vec.z;
return *this;
}
template<typename T>
constexpr Vec3<T>& Vec3<T>::Minimize(const Vec3& vec)
{
if (vec.x < x)
x = vec.x;
if (vec.y < y)
y = vec.y;
if (vec.z < z)
z = vec.z;
return *this;
}
template<typename T>
Vec3<T>& Vec3<T>::Normalize(T* length)
{
T norm = GetLength();
if (norm > T(0.0))
{
T invNorm = T(1.0) / norm;
x *= invNorm;
y *= invNorm;
z *= invNorm;
}
if (length)
*length = norm;
return *this;
}
template<typename T>
constexpr T Vec3<T>::SquaredDistance(const Vec3& vec) const
{
return (*this - vec).GetSquaredLength();
}
template<typename T>
std::string Vec3<T>::ToString() const
{
return "Vec3(" + std::to_string(x) + ", " + std::to_string(y) + ", " + std::to_string(z) + ')';
}
template<typename T>
constexpr T& Vec3<T>::operator[](std::size_t i)
{
mlx::Assert(i < 3, "index out of range");
return *(&x + i);
}
template<typename T>
constexpr const T& Vec3<T>::operator[](std::size_t i) const
{
mlx::Assert(i < 3, "index out of range");
return *(&x + i);
}
template<typename T>
constexpr const Vec3<T>& Vec3<T>::operator+() const
{
return *this;
}
template<typename T>
constexpr Vec3<T> Vec3<T>::operator-() const
{
return Vec3(-x, -y, -z);
}
template<typename T>
constexpr Vec3<T> Vec3<T>::operator+(const Vec3& vec) const
{
return Vec3(x + vec.x, y + vec.y, z + vec.z);
}
template<typename T>
constexpr Vec3<T> Vec3<T>::operator-(const Vec3& vec) const
{
return Vec3(x - vec.x, y - vec.y, z - vec.z);
}
template<typename T>
constexpr Vec3<T> Vec3<T>::operator*(const Vec3& vec) const
{
return Vec3(x * vec.x, y * vec.y, z * vec.z);
}
template<typename T>
constexpr Vec3<T> Vec3<T>::operator*(T scale) const
{
return Vec3(x * scale, y * scale, z * scale);
}
template<typename T>
constexpr Vec3<T> Vec3<T>::operator/(const Vec3& vec) const
{
return Vec3(x / vec.x, y / vec.y, z / vec.z);
}
template<typename T>
constexpr Vec3<T> Vec3<T>::operator/(T scale) const
{
return Vec3(x / scale, y / scale, z / scale);
}
template<typename T>
constexpr Vec3<T> Vec3<T>::operator%(const Vec3& vec) const
{
return Vec3(Mod(x, vec.x), Mod(y, vec.y), Mod(z, vec.z));
}
template<typename T>
constexpr Vec3<T> Vec3<T>::operator%(T mod) const
{
return Vec3(Mod(x, mod), Mod(y, mod), Mod(z, mod));
}
template<typename T>
constexpr Vec3<T>& Vec3<T>::operator+=(const Vec3& vec)
{
x += vec.x;
y += vec.y;
z += vec.z;
return *this;
}
template<typename T>
constexpr Vec3<T>& Vec3<T>::operator-=(const Vec3& vec)
{
x -= vec.x;
y -= vec.y;
z -= vec.z;
return *this;
}
template<typename T>
constexpr Vec3<T>& Vec3<T>::operator*=(const Vec3& vec)
{
x *= vec.x;
y *= vec.y;
z *= vec.z;
return *this;
}
template<typename T>
constexpr Vec3<T>& Vec3<T>::operator*=(T scale)
{
x *= scale;
y *= scale;
z *= scale;
return *this;
}
template<typename T>
constexpr Vec3<T>& Vec3<T>::operator/=(const Vec3& vec)
{
x /= vec.x;
y /= vec.y;
z /= vec.z;
return *this;
}
template<typename T>
constexpr Vec3<T>& Vec3<T>::operator/=(T scale)
{
x /= scale;
y /= scale;
z /= scale;
return *this;
}
template<typename T>
constexpr Vec3<T>& Vec3<T>::operator%=(const Vec3& vec)
{
x = Mod(x, vec.x);
y = Mod(y, vec.y);
z = Mod(z, vec.z);
return *this;
}
template<typename T>
constexpr Vec3<T>& Vec3<T>::operator%=(T mod)
{
x = Mod(x, mod);
y = Mod(y, mod);
z = Mod(z, mod);
return *this;
}
template<typename T>
constexpr bool Vec3<T>::operator==(const Vec3& vec) const
{
return x == vec.x && y == vec.y && z == vec.z;
}
template<typename T>
constexpr bool Vec3<T>::operator!=(const Vec3& vec) const
{
return !operator==(vec);
}
template<typename T>
constexpr bool Vec3<T>::operator<(const Vec3& vec) const
{
if (x != vec.x)
return x < vec.x;
if (y != vec.y)
return y < vec.y;
return z < vec.z;
}
template<typename T>
constexpr bool Vec3<T>::operator<=(const Vec3& vec) const
{
if (x != vec.x)
return x < vec.x;
if (y != vec.y)
return y < vec.y;
return z <= vec.z;
}
template<typename T>
constexpr bool Vec3<T>::operator>(const Vec3& vec) const
{
if (x != vec.x)
return x > vec.x;
if (y != vec.y)
return y > vec.y;
return z > vec.z;
}
template<typename T>
constexpr bool Vec3<T>::operator>=(const Vec3& vec) const
{
if (x != vec.x)
return x > vec.x;
if (y != vec.y)
return y > vec.y;
return z >= vec.z;
}
template<typename T>
constexpr Vec3<T> Vec3<T>::Apply(T(*func)(T), const Vec3& vec)
{
return Vec3(func(vec.x), func(vec.y), func(vec.z));
}
template<typename T>
constexpr bool Vec3<T>::ApproxEqual(const Vec3& lhs, const Vec3& rhs, T maxDifference)
{
return lhs.ApproxEqual(rhs, maxDifference);
}
template<typename T>
constexpr Vec3<T> Vec3<T>::CrossProduct(const Vec3& vec1, const Vec3& vec2)
{
return vec1.CrossProduct(vec2);
}
template<typename T>
constexpr T Vec3<T>::DotProduct(const Vec3& vec1, const Vec3& vec2)
{
return vec1.DotProduct(vec2);
}
template<typename T>
constexpr Vec3<T> Vec3<T>::Backward()
{
return Vec3(0, 0, 1);
}
template<typename T>
template<typename U>
U Vec3<T>::Distance(const Vec3& vec1, const Vec3& vec2)
{
return vec1.Distance<U>(vec2);
}
template<typename T>
constexpr Vec3<T> Vec3<T>::Down()
{
return Vec3(0, -1, 0);
}
template<typename T>
constexpr Vec3<T> Vec3<T>::Forward()
{
return Vec3(0, 0, -1);
}
template<typename T>
constexpr Vec3<T> Vec3<T>::Left()
{
return Vec3(-1, 0, 0);
}
template<typename T>
constexpr Vec3<T> Vec3<T>::Max(const Vec3& lhs, const Vec3& rhs)
{
Vec3 max = lhs;
max.Maximize(rhs);
return max;
}
template<typename T>
constexpr Vec3<T> Vec3<T>::Min(const Vec3& lhs, const Vec3& rhs)
{
Vec3 min = lhs;
min.Minimize(rhs);
return min;
}
template<typename T>
Vec3<T> Vec3<T>::Normalize(const Vec3& vec)
{
return vec.GetNormal();
}
template<typename T>
constexpr Vec3<T> Vec3<T>::Right()
{
return Vec3(1, 0, 0);
}
template<typename T>
constexpr T Vec3<T>::SquaredDistance(const Vec3& vec1, const Vec3& vec2)
{
return vec1.SquaredDistance(vec2);
}
template<typename T>
constexpr Vec3<T> Vec3<T>::Unit()
{
return Vec3(1);
}
template<typename T>
constexpr Vec3<T> Vec3<T>::UnitX()
{
return Vec3(1, 0, 0);
}
template<typename T>
constexpr Vec3<T> Vec3<T>::UnitY()
{
return Vec3(0, 1, 0);
}
template<typename T>
constexpr Vec3<T> Vec3<T>::UnitZ()
{
return Vec3(0, 0, 1);
}
template<typename T>
constexpr Vec3<T> Vec3<T>::Up()
{
return Vec3(0, 1, 0);
}
template<typename T>
constexpr Vec3<T> Vec3<T>::Zero()
{
return Vec3(0, 0, 0);
}
template<typename T>
std::ostream& operator<<(std::ostream& out, const Vec3<T>& vec)
{
return out << "Vec3(" << vec.x << ", " << vec.y << ", " << vec.z << ')';
}
template<typename T>
constexpr Vec3<T> operator*(T scale, const Vec3<T>& vec)
{
return Vec3<T>(scale * vec.x, scale * vec.y, scale * vec.z);
}
template<typename T>
constexpr Vec3<T> operator/(T scale, const Vec3<T>& vec)
{
return Vec3<T>(scale / vec.x, scale / vec.y, scale / vec.z);
}
template<typename T>
constexpr Vec3<T> operator%(T mod, const Vec3<T>& vec)
{
return Vec3<T>(Mod(mod, vec.x), Mod(mod, vec.y), Mod(mod, vec.z));
}
}
+108
View File
@@ -0,0 +1,108 @@
#ifndef __MLX_VEC4__
#define __MLX_VEC4__
namespace mlx
{
template<typename T> struct Vec2;
template<typename T> struct Vec3;
template<typename T>
struct Vec4
{
union { T x, r, s; };
union { T y, g, t; };
union { T z, b, p; };
union { T w, a, q; };
constexpr Vec4() = default;
constexpr Vec4(T X, T Y, T Z, T W = 1.0);
constexpr Vec4(T X, T Y, const Vec2<T>& vec);
constexpr Vec4(T X, const Vec2<T>& vec, T W);
constexpr Vec4(T X, const Vec3<T>& vec);
constexpr explicit Vec4(T scale);
constexpr Vec4(const Vec2<T>& vec, T Z = 0.0, T W = 1.0);
constexpr Vec4(const Vec3<T>& vec, T W = 1.0);
template<typename U> constexpr explicit Vec4(const Vec4<U>& vec);
constexpr Vec4(const Vec4&) = default;
constexpr Vec4(Vec4&&) = default;
T AbsDotProduct(const Vec4& vec) const;
constexpr bool ApproxEqual(const Vec4& vec, T max_difference = std::numeric_limits<T>::epsilon()) const;
constexpr T DotProduct(const Vec4& vec) const;
Vec4 GetNormal(T* length = nullptr) const;
constexpr Vec4& Maximize(const Vec4& vec);
constexpr Vec4& Minimize(const Vec4& vec);
Vec4& Normalize(T* length = nullptr);
std::string ToString() const;
constexpr Vec4& operator=(const Vec4&) = default;
constexpr Vec4& operator=(Vec4&&) = default;
constexpr T& operator[](std::size_t i);
constexpr const T& operator[](std::size_t i) const;
constexpr const Vec4& operator+() const;
constexpr Vec4 operator-() const;
constexpr Vec4 operator+(const Vec4& vec) const;
constexpr Vec4 operator-(const Vec4& vec) const;
constexpr Vec4 operator*(const Vec4& vec) const;
constexpr Vec4 operator*(T scale) const;
constexpr Vec4 operator/(const Vec4& vec) const;
constexpr Vec4 operator/(T scale) const;
constexpr Vec4 operator%(const Vec4& vec) const;
constexpr Vec4 operator%(T mod) const;
constexpr Vec4& operator+=(const Vec4& vec);
constexpr Vec4& operator-=(const Vec4& vec);
constexpr Vec4& operator*=(const Vec4& vec);
constexpr Vec4& operator*=(T scale);
constexpr Vec4& operator/=(const Vec4& vec);
constexpr Vec4& operator/=(T scale);
constexpr Vec4& operator%=(const Vec4& vec);
constexpr Vec4& operator%=(T mod);
constexpr bool operator==(const Vec4& vec) const;
constexpr bool operator!=(const Vec4& vec) const;
constexpr bool operator<(const Vec4& vec) const;
constexpr bool operator<=(const Vec4& vec) const;
constexpr bool operator>(const Vec4& vec) const;
constexpr bool operator>=(const Vec4& vec) const;
static constexpr Vec4 Apply(T(*func)(T), const Vec4& vec);
static constexpr bool ApproxEqual(const Vec4& lhs, const Vec4& rhs, T max_difference = std::numeric_limits<T>::epsilon());
static constexpr T DotProduct(const Vec4& vec1, const Vec4& vec2);
static Vec4 Normalize(const Vec4& vec);
static constexpr Vec4 UnitX();
static constexpr Vec4 UnitY();
static constexpr Vec4 UnitZ();
static constexpr Vec4 Zero();
~Vec4() = default;
};
using Vec4d = Vec4<double>;
using Vec4f = Vec4<float>;
using Vec4i = Vec4<int>;
using Vec4ui = Vec4<unsigned int>;
using Vec4i32 = Vec4<std::int32_t>;
using Vec4i64 = Vec4<std::int64_t>;
using Vec4ui32 = Vec4<std::uint32_t>;
using Vec4ui64 = Vec4<std::uint64_t>;
template<typename T> std::ostream& operator<<(std::ostream& out, const Vec4<T>& vec);
template<typename T> constexpr Vec4<T> operator*(T scale, const Vec4<T>& vec);
template<typename T> constexpr Vec4<T> operator/(T scale, const Vec4<T>& vec);
template<typename T> constexpr Vec4<T> operator%(T mod, const Vec4<T>& vec);
}
#include <Maths/Vec4.inl>
#endif // __AK_VEC4__
+423
View File
@@ -0,0 +1,423 @@
#pragma once
#include <Maths/Vec4.h>
namespace mlx
{
template<typename T>
constexpr Vec4<T>::Vec4(T X, T Y, T Z, T W) : x(X), y(Y), z(Z), w(W) {}
template<typename T>
constexpr Vec4<T>::Vec4(T X, T Y, const Vec2<T>& vec) : x(X), y(Y), z(vec.x), w(vec.y) {}
template<typename T>
constexpr Vec4<T>::Vec4(T X, const Vec2<T>& vec, T W) : x(X), y(vec.x), z(vec.y), w(W) {}
template<typename T>
constexpr Vec4<T>::Vec4(T X, const Vec3<T>& vec) : x(X), y(vec.x), z(vec.y), w(vec.z) {}
template<typename T>
constexpr Vec4<T>::Vec4(T scale) : x(scale), y(scale), z(scale), w(scale) {}
template<typename T>
constexpr Vec4<T>::Vec4(const Vec2<T>& vec, T Z, T W) : x(vec.x), y(vec.y), z(Z), w(W) {}
template<typename T>
constexpr Vec4<T>::Vec4(const Vec3<T>& vec, T W) : x(vec.x), y(vec.y), z(vec.z), w(W) {}
template<typename T>
template<typename U>
constexpr Vec4<T>::Vec4(const Vec4<U>& vec) : x(static_cast<T>(vec.x)), y(static_cast<T>(vec.y)), z(static_cast<T>(vec.z)), w(static_cast<T>(vec.w)) {}
template<typename T>
T Vec4<T>::AbsDotProduct(const Vec4& vec) const
{
return std::abs(x * vec.x) + std::abs(y * vec.y) + std::abs(z * vec.z) + std::abs(w * vec.w);
}
template<typename T>
constexpr bool Vec4<T>::ApproxEqual(const Vec4& vec, T maxDifference) const
{
return NumberEquals(x, vec.x, maxDifference) && NumberEquals(y, vec.y, maxDifference) && NumberEquals(z, vec.z, maxDifference) && NumberEquals(w, vec.w, maxDifference);
}
template<typename T>
constexpr T Vec4<T>::DotProduct(const Vec4& vec) const
{
return x*vec.x + y*vec.y + z*vec.z + w*vec.w;
}
template<typename T>
Vec4<T> Vec4<T>::GetNormal(T* length) const
{
Vec4<T> vec(*this);
vec.Normalize(length);
return vec;
}
template<typename T>
constexpr Vec4<T>& Vec4<T>::Maximize(const Vec4& vec)
{
if (vec.x > x)
x = vec.x;
if (vec.y > y)
y = vec.y;
if (vec.z > z)
z = vec.z;
if (vec.w > w)
w = vec.w;
return *this;
}
template<typename T>
constexpr Vec4<T>& Vec4<T>::Minimize(const Vec4& vec)
{
if (vec.x < x)
x = vec.x;
if (vec.y < y)
y = vec.y;
if (vec.z < z)
z = vec.z;
if (vec.w < w)
w = vec.w;
return *this;
}
template<typename T>
Vec4<T>& Vec4<T>::Normalize(T* length)
{
T invLength = T(1.0) / w;
x *= invLength;
y *= invLength;
z *= invLength;
if (length)
*length = w;
w = T(1.0);
return *this;
}
template<typename T>
std::string Vec4<T>::ToString() const
{
std::ostringstream ss;
ss << *this;
return ss.str();
}
template<typename T>
constexpr T& Vec4<T>::operator[](std::size_t i)
{
mlx::Assert(i < 4, "index out of range");
return *(&x + i);
}
template<typename T>
constexpr const T& Vec4<T>::operator[](std::size_t i) const
{
mlx::Assert(i < 4, "index out of range");
return *(&x + i);
}
template<typename T>
constexpr const Vec4<T>& Vec4<T>::operator+() const
{
return *this;
}
template<typename T>
constexpr Vec4<T> Vec4<T>::operator-() const
{
return Vec4(-x, -y, -z, -w);
}
template<typename T>
constexpr Vec4<T> Vec4<T>::operator+(const Vec4& vec) const
{
return Vec4(x + vec.x, y + vec.y, z + vec.z, w + vec.w);
}
template<typename T>
constexpr Vec4<T> Vec4<T>::operator-(const Vec4& vec) const
{
return Vec4(x - vec.x, y - vec.y, z - vec.z, w - vec.w);
}
template<typename T>
constexpr Vec4<T> Vec4<T>::operator*(const Vec4& vec) const
{
return Vec4(x * vec.x, y * vec.y, z * vec.z, w * vec.w);
}
template<typename T>
constexpr Vec4<T> Vec4<T>::operator*(T scale) const
{
return Vec4(x * scale, y * scale, z * scale, w * scale);
}
template<typename T>
constexpr Vec4<T> Vec4<T>::operator/(const Vec4& vec) const
{
return Vec4(x / vec.x, y / vec.y, z / vec.z, w / vec.w);
}
template<typename T>
constexpr Vec4<T> Vec4<T>::operator/(T scale) const
{
return Vec4(x / scale, y / scale, z / scale, w / scale);
}
template<typename T>
constexpr Vec4<T> Vec4<T>::operator%(const Vec4& vec) const
{
return Vec4(Mod(x, vec.x), Mod(y, vec.y), Mod(z, vec.z), Mod(w, vec.w));
}
template<typename T>
constexpr Vec4<T> Vec4<T>::operator%(T mod) const
{
return Vec4(Mod(x, mod), Mod(y, mod), Mod(z, mod), Mod(z, mod));
}
template<typename T>
constexpr Vec4<T>& Vec4<T>::operator+=(const Vec4& vec)
{
x += vec.x;
y += vec.y;
z += vec.z;
w += vec.w;
return *this;
}
template<typename T>
constexpr Vec4<T>& Vec4<T>::operator-=(const Vec4& vec)
{
x -= vec.x;
y -= vec.y;
z -= vec.z;
w -= vec.w;
return *this;
}
template<typename T>
constexpr Vec4<T>& Vec4<T>::operator*=(const Vec4& vec)
{
x *= vec.x;
y *= vec.y;
z *= vec.z;
w *= vec.w;
return *this;
}
template<typename T>
constexpr Vec4<T>& Vec4<T>::operator*=(T scale)
{
x *= scale;
y *= scale;
z *= scale;
w *= scale;
return *this;
}
template<typename T>
constexpr Vec4<T>& Vec4<T>::operator/=(const Vec4& vec)
{
x /= vec.x;
y /= vec.y;
z /= vec.z;
w /= vec.w;
return *this;
}
template<typename T>
constexpr Vec4<T>& Vec4<T>::operator/=(T scale)
{
x /= scale;
y /= scale;
z /= scale;
w /= scale;
return *this;
}
template<typename T>
constexpr Vec4<T>& Vec4<T>::operator%=(const Vec4& vec)
{
x = Mod(x, vec.x);
y = Mod(y, vec.y);
z = Mod(z, vec.z);
w = Mod(w, vec.w);
return *this;
}
template<typename T>
constexpr Vec4<T>& Vec4<T>::operator%=(T mod)
{
x = Mod(x, mod);
y = Mod(y, mod);
z = Mod(z, mod);
w = Mod(w, mod);
return *this;
}
template<typename T>
constexpr bool Vec4<T>::operator==(const Vec4& vec) const
{
return x == vec.x && y == vec.y && z == vec.z && w == vec.w;
}
template<typename T>
constexpr bool Vec4<T>::operator!=(const Vec4& vec) const
{
return !operator==(vec);
}
template<typename T>
constexpr bool Vec4<T>::operator<(const Vec4& vec) const
{
if (x != vec.x)
return x < vec.x;
if (y != vec.y)
return y < vec.y;
if (z != vec.z)
return z < vec.z;
return w < vec.w;
}
template<typename T>
constexpr bool Vec4<T>::operator<=(const Vec4& vec) const
{
if (x != vec.x)
return x < vec.x;
if (y != vec.y)
return y < vec.y;
if (z != vec.z)
return z < vec.z;
return w <= vec.w;
}
template<typename T>
constexpr bool Vec4<T>::operator>(const Vec4& vec) const
{
if (x != vec.x)
return x > vec.x;
if (y != vec.y)
return y > vec.y;
if (z != vec.z)
return z > vec.z;
return w > vec.w;
}
template<typename T>
constexpr bool Vec4<T>::operator>=(const Vec4& vec) const
{
if (x != vec.x)
return x > vec.x;
if (y != vec.y)
return y > vec.y;
if (z != vec.z)
return z > vec.z;
return w >= vec.w;
}
template<typename T>
constexpr Vec4<T> Vec4<T>::Apply(T(*func)(T), const Vec4& vec)
{
return Vec4(func(vec.x), func(vec.y), func(vec.z), func(vec.w));
}
template<typename T>
constexpr bool Vec4<T>::ApproxEqual(const Vec4& lhs, const Vec4& rhs, T maxDifference)
{
return lhs.ApproxEqual(rhs, maxDifference);
}
template<typename T>
constexpr T Vec4<T>::DotProduct(const Vec4& vec1, const Vec4& vec2)
{
return vec1.DotProduct(vec2);
}
template<typename T>
Vec4<T> Vec4<T>::Normalize(const Vec4& vec)
{
return vec.GetNormal();
}
template<typename T>
constexpr Vec4<T> Vec4<T>::UnitX()
{
return Vec4(1, 0, 0, 1);
}
template<typename T>
constexpr Vec4<T> Vec4<T>::UnitY()
{
return Vec4(0, 1, 0, 1);
}
template<typename T>
constexpr Vec4<T> Vec4<T>::UnitZ()
{
return Vec4(0, 0, 1, 1);
}
template<typename T>
constexpr Vec4<T> Vec4<T>::Zero()
{
return Vec4(0, 0, 0, 1);
}
template<typename T>
std::ostream& operator<<(std::ostream& out, const Vec4<T>& vec)
{
return out << "Vec4(" << vec.x << ", " << vec.y << ", " << vec.z << ", " << vec.w << ')';
}
template<typename T>
constexpr Vec4<T> operator*(T scale, const Vec4<T>& vec)
{
return Vec4<T>(scale * vec.x, scale * vec.y, scale * vec.z, scale * vec.w);
}
template<typename T>
constexpr Vec4<T> operator/(T scale, const Vec4<T>& vec)
{
return Vec4<T>(scale / vec.x, scale / vec.y, scale / vec.z, scale / vec.w);
}
template<typename T>
constexpr Vec4<T> operator%(T mod, const Vec4<T>& vec)
{
return Vec4<T>(Mod(mod, vec.x), Mod(mod, vec.y), Mod(mod, vec.z), Mod(mod, vec.w));
}
}
+52
View File
@@ -0,0 +1,52 @@
#ifndef __MLX_INPUTS__
#define __MLX_INPUTS__
#include <mlx.h>
#include <mlx_profile.h>
#include <Platform/Window.h>
namespace mlx
{
class Inputs
{
public:
struct Hook
{
std::function<void(int, void*)> fn;
void* param = nullptr;
Hook(std::function<void(int, void*)> fn, void* param) : fn(fn), param(param) {}
};
public:
Inputs() = default;
void FetchInputs();
inline void RegisterWindow(std::shared_ptr<Window> window) { m_windows[window->GetID()] = window; }
std::int32_t GetX() const noexcept;
std::int32_t GetY() const noexcept;
std::int32_t GetXRel() const noexcept;
std::int32_t GetYRel() const noexcept;
inline bool IsMouseMoving() const noexcept { return GetXRel() || GetYRel(); }
MLX_FORCEINLINE bool IsRunning() const noexcept { return m_run; }
MLX_FORCEINLINE constexpr void Finish() noexcept { m_run = false; }
MLX_FORCEINLINE constexpr void Run() noexcept { m_run = true; }
inline void OnEvent(std::uint32_t id, int event, void(*f)(int, void*), void* param) noexcept
{
m_events_hooks[id][event].emplace_back(f, param);
}
~Inputs() = default;
private:
std::unordered_map<std::uint32_t, std::shared_ptr<Window>> m_windows;
std::unordered_map<std::uint32_t, std::array<std::vector<Hook>, 6>> m_events_hooks;
bool m_run = false;
};
}
#endif
+55
View File
@@ -0,0 +1,55 @@
#ifndef __MLX_WINDOW__
#define __MLX_WINDOW__
#include <mlx.h>
#include <Maths/Vec2.h>
#include <Core/SDLManager.h>
namespace mlx
{
class Window
{
public:
Window(const mlx_window_create_info* info, bool hidden = false);
MLX_FORCEINLINE Handle GetWindowHandle() const noexcept { return p_window; }
MLX_FORCEINLINE int GetWidth() noexcept { SDLManager::Get().GetWindowSize(p_window, &m_width, &m_height); return m_width; }
MLX_FORCEINLINE int GetHeight() noexcept { SDLManager::Get().GetWindowSize(p_window, &m_width, &m_height); return m_height; }
MLX_FORCEINLINE std::uint32_t GetID() const noexcept { return m_id; }
MLX_FORCEINLINE const std::string& GetName() const { return m_name; }
MLX_FORCEINLINE void MoveMouse(int x, int y) { SDLManager::Get().MoveMouseOnWindow(p_window, x, y); }
MLX_FORCEINLINE void GetScreenSizeWindowIsOn(int* x, int* y) { SDLManager::Get().GetScreenSizeWindowIsOn(p_window, x, y); }
MLX_FORCEINLINE void SetPosition(int x, int y) { SDLManager::Get().SetWindowPosition(p_window, x, y); }
MLX_FORCEINLINE void SetSize(int x, int y) { SDLManager::Get().SetWindowSize(p_window, x, y); m_width = x; m_height = y; }
MLX_FORCEINLINE void SetTitle(std::string title) { SDLManager::Get().SetWindowTitle(p_window, title); m_name = std::move(title); }
MLX_FORCEINLINE void SetFullscreen(bool enable) { SDLManager::Get().SetWindowFullscreen(p_window, enable); }
MLX_FORCEINLINE void SetMaxSize(int x, int y) { SDLManager::Get().SetWindowMaxSize(p_window, x, y); }
MLX_FORCEINLINE void SetMinSize(int x, int y) { SDLManager::Get().SetWindowMinSize(p_window, x, y); }
MLX_FORCEINLINE void Maximize() { SDLManager::Get().MaximizeWindow(p_window); }
MLX_FORCEINLINE void Minimize() { SDLManager::Get().MinimizeWindow(p_window); }
MLX_FORCEINLINE void Restore() { SDLManager::Get().RestoreWindow(p_window); }
MLX_FORCEINLINE void GetPosition(int* x, int* y) { SDLManager::Get().GetWindowPosition(p_window, x, y); }
MLX_FORCEINLINE void GetSize(int* x, int* y) { *x = GetWidth(); *y = GetHeight(); }
MLX_FORCEINLINE VkSurfaceKHR CreateVulkanSurface(VkInstance instance) const noexcept { return SDLManager::Get().CreateVulkanSurface(p_window, instance); }
MLX_FORCEINLINE Vec2ui GetVulkanDrawableSize() const noexcept { return SDLManager::Get().GetVulkanDrawableSize(p_window); }
[[nodiscard]] inline Handle GetRawHandle() const noexcept { return p_window; }
void Destroy() noexcept;
~Window() { Destroy(); }
private:
std::string m_name;
Handle p_window = nullptr;
std::int32_t m_id;
int m_width = 0;
int m_height = 0;
};
}
#endif
+125
View File
@@ -0,0 +1,125 @@
#ifndef __MLX_PRE_COMPILED_HEADER__
#define __MLX_PRE_COMPILED_HEADER__
#define VK_NO_PROTOTYPES
#include <mlx_profile.h>
#include <mlx.h>
#include <cstdio>
#include <cstdarg>
#include <iostream>
#include <cstddef>
#include <cstdint>
#include <cstdlib>
#include <cstring>
#include <ctime>
#include <vulkan/vulkan.h>
#if __has_include(<SDL2/SDL.h>)
#include <SDL2/SDL.h>
#elif __has_include(<SDL.h>)
#include <SDL.h>
#else
#error Failed to find SDL2 headers
#endif
#if __has_include(<SDL2/SDL_syswm.h>)
#include <SDL2/SDL_syswm.h>
#elif __has_include(<SDL_syswm.h>)
#include <SDL_syswm.h>
#else
#error Failed to find SDL2 SysWMinfo
#endif
#include <functional>
#include <memory>
#include <list>
#include <map>
#include <unordered_map>
#include <utility>
#include <fstream>
#include <filesystem>
#include <thread>
#include <mutex>
#include <string>
#include <string_view>
#include <chrono>
#include <unordered_set>
#include <array>
#include <optional>
#include <set>
#include <random>
#include <concepts>
#include <algorithm>
#include <sstream>
#include <iomanip>
#include <iterator>
#include <stb_truetype.h>
#include <variant>
#include <bit>
#include <type_traits>
#include <string_view>
#include <sstream>
#include <ostream>
#include <ranges>
#ifndef MLX_PLAT_WINDOWS
#include <dlfcn.h>
#endif
#ifdef MLX_PLAT_LINUX
#include <math.h> // sincos
#endif
#include <Core/Memory.h>
#include <Core/Logs.h>
#define VMA_STATIC_VULKAN_FUNCTIONS 0
#define VMA_DYNAMIC_VULKAN_FUNCTIONS 0
#define VMA_VULKAN_VERSION 1000000
#define VMA_SYSTEM_ALIGNED_MALLOC(size, alignment) (mlx::MemManager::AlignedMalloc(alignment, size))
#define VMA_SYSTEM_ALIGNED_FREE(ptr) (mlx::MemManager::Free(ptr))
//#define VMA_ASSERT(expr) (mlx::Assert(expr, "VMA Assertion: " #expr))
#define VMA_ASSERT(expr) ((void)0)
#define VMA_ASSERT_LEAK(expr) ((void)0) // Because why not
#ifdef MLX_COMPILER_CLANG
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Weverything"
#include <vma.h>
#pragma clang diagnostic pop
#elif defined(MLX_COMPILER_GCC)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wunused-function"
#pragma GCC diagnostic ignored "-Wparentheses"
#include <vma.h>
#pragma GCC diagnostic pop
#else
#include <vma.h>
#endif
#include <Utils/AntiX11.h>
#include <Utils/AntiWindows.h>
#define KVF_IMPL_VK_NO_PROTOTYPES
#ifdef DEBUG
#define KVF_ENABLE_VALIDATION_LAYERS
#endif
#include <kvf.h>
#include <Core/EventBus.h>
#include <Core/Profiler.h>
#include <Utils/NonOwningPtr.h>
#include <Utils/NonCopyable.h>
constexpr const int RANGE = 1024;
using Handle = void*;
#endif
+87
View File
@@ -0,0 +1,87 @@
#ifndef __MLX_GPU_BUFFER__
#define __MLX_GPU_BUFFER__
#include <Renderer/Enums.h>
#include <Renderer/RenderCore.h>
#include <Utils/Buffer.h>
namespace mlx
{
class GPUBuffer
{
public:
GPUBuffer() = default;
void Init(BufferType type, VkDeviceSize size, VkBufferUsageFlags usage, CPUBuffer data, [[maybe_unused]] std::string_view debug_name);
void Destroy() noexcept;
bool CopyFrom(const GPUBuffer& buffer) noexcept;
void Swap(GPUBuffer& buffer) noexcept;
template<typename T = void*>
[[nodiscard]] MLX_FORCEINLINE T GetMap() const noexcept { return reinterpret_cast<T>(p_map); }
[[nodiscard]] MLX_FORCEINLINE VkBuffer Get() const noexcept { return m_buffer; }
[[nodiscard]] MLX_FORCEINLINE VmaAllocation GetAllocation() const noexcept { return m_allocation; }
[[nodiscard]] MLX_FORCEINLINE VkDeviceSize GetSize() const noexcept { return m_size; }
[[nodiscard]] MLX_FORCEINLINE VkDeviceSize GetOffset() const noexcept { return m_offset; }
[[nodiscard]] inline bool IsInit() const noexcept { return m_buffer != VK_NULL_HANDLE; }
~GPUBuffer() = default;
protected:
void PushToGPU() noexcept;
protected:
#ifdef DEBUG
std::string m_debug_name;
#endif
VkBuffer m_buffer = VK_NULL_HANDLE;
VmaAllocation m_allocation;
VkDeviceSize m_offset = 0;
VkDeviceSize m_size = 0;
void* p_map = nullptr;
private:
void CreateBuffer(VkDeviceSize size, VkBufferUsageFlags usage, VmaAllocationCreateInfo alloc_info, [[maybe_unused]] std::string_view debug_name);
private:
VkBufferUsageFlags m_usage = 0;
};
class VertexBuffer : public GPUBuffer
{
public:
inline void Init(std::uint32_t size, VkBufferUsageFlags additional_flags, [[maybe_unused]] std::string_view debug_name) { GPUBuffer::Init(BufferType::LowDynamic, size, VK_BUFFER_USAGE_VERTEX_BUFFER_BIT | additional_flags, {}, std::move(debug_name)); }
void SetData(CPUBuffer data);
inline void Bind(VkCommandBuffer cmd) const noexcept { VkDeviceSize offset = 0; RenderCore::Get().vkCmdBindVertexBuffers(cmd, 0, 1, &m_buffer, &offset); }
};
class IndexBuffer : public GPUBuffer
{
public:
inline void Init(std::uint32_t size, VkBufferUsageFlags additional_flags, [[maybe_unused]] std::string_view debug_name) { GPUBuffer::Init(BufferType::LowDynamic, size, VK_BUFFER_USAGE_INDEX_BUFFER_BIT | additional_flags, {}, std::move(debug_name)); }
void SetData(CPUBuffer data);
inline void Bind(VkCommandBuffer cmd) const noexcept { RenderCore::Get().vkCmdBindIndexBuffer(cmd, m_buffer, 0, VK_INDEX_TYPE_UINT32); }
};
class UniformBuffer
{
public:
void Init(std::uint32_t size, [[maybe_unused]] std::string_view debug_name);
void SetData(CPUBuffer data, std::size_t frame_index);
void Destroy() noexcept;
inline VkDeviceSize GetSize(int i) const noexcept { return m_buffers[i].GetSize(); }
inline VkDeviceSize GetOffset(int i) const noexcept { return m_buffers[i].GetOffset(); }
inline VkBuffer GetVk(int i) const noexcept { return m_buffers[i].Get(); }
inline GPUBuffer& Get(int i) noexcept { return m_buffers[i]; }
private:
std::array<GPUBuffer, MAX_FRAMES_IN_FLIGHT> m_buffers;
std::array<void*, MAX_FRAMES_IN_FLIGHT> m_maps;
};
}
#endif
+88
View File
@@ -0,0 +1,88 @@
#ifndef __MLX_DESCRIPTOR_SET__
#define __MLX_DESCRIPTOR_SET__
#include <Renderer/Enums.h>
#include <Renderer/RenderCore.h>
#include <Renderer/Pipelines/Shader.h>
namespace mlx
{
struct Descriptor
{
NonOwningPtr<class GPUBuffer> storage_buffer_ptr;
NonOwningPtr<class GPUBuffer> uniform_buffer_ptr;
NonOwningPtr<class Image> image_ptr;
VkDescriptorType type;
std::uint32_t binding;
};
class DescriptorPool
{
public:
DescriptorPool() = default;
void Init() noexcept;
void Destroy() noexcept;
std::shared_ptr<class DescriptorSet> RequestDescriptorSet(const ShaderSetLayout& layout, ShaderType shader_type);
void ReturnDescriptorSet(std::shared_ptr<class DescriptorSet> set);
bool CanAllocate(const ShaderSetLayout& layout, ShaderType shader_type) const;
[[nodiscard]] inline VkDescriptorPool Get() const noexcept { return m_pool; }
~DescriptorPool() = default;
private:
std::vector<std::shared_ptr<class DescriptorSet>> m_free_sets;
std::vector<std::shared_ptr<class DescriptorSet>> m_used_sets;
VkDescriptorPool m_pool;
};
class DescriptorPoolManager
{
public:
DescriptorPoolManager() = default;
DescriptorPool& GetAvailablePool(const ShaderSetLayout& layout, ShaderType shader_type);
void Destroy();
~DescriptorPoolManager() = default;
private:
std::vector<std::unique_ptr<DescriptorPool>> m_pools;
};
class DescriptorSet : public std::enable_shared_from_this<DescriptorSet>
{
friend DescriptorPool;
public:
void SetImage(std::size_t i, std::uint32_t binding, class Image& image);
void SetStorageBuffer(std::size_t i, std::uint32_t binding, class GPUBuffer& buffer);
void SetUniformBuffer(std::size_t i, std::uint32_t binding, class GPUBuffer& buffer);
void Update(std::size_t i, VkCommandBuffer cmd = VK_NULL_HANDLE) noexcept;
void ReturnDescriptorSetToPool();
[[nodiscard]] inline VkDescriptorSet GetSet(std::size_t i) const noexcept { return m_sets[i]; }
[[nodiscard]] MLX_FORCEINLINE bool IsInit() const noexcept { return m_sets[0] != VK_NULL_HANDLE; }
[[nodiscard]] MLX_FORCEINLINE VkDescriptorSetLayout GetVulkanLayout() const noexcept { return m_set_layout; }
[[nodiscard]] MLX_FORCEINLINE const ShaderSetLayout& GetShaderLayout() const { return m_shader_layout; }
[[nodiscard]] MLX_FORCEINLINE ShaderType GetShaderType() const noexcept { return m_shader_type; }
~DescriptorSet() = default;
private:
DescriptorSet(DescriptorPool& pool, VkDescriptorSetLayout vulkan_layout, const ShaderSetLayout& layout, std::array<VkDescriptorSet, MAX_FRAMES_IN_FLIGHT> vulkan_sets, ShaderType shader_type);
private:
ShaderSetLayout m_shader_layout;
std::vector<Descriptor> m_descriptors;
std::array<VkDescriptorSet, MAX_FRAMES_IN_FLIGHT> m_sets;
VkDescriptorSetLayout m_set_layout;
ShaderType m_shader_type;
DescriptorPool& m_pool;
};
}
#endif
+32
View File
@@ -0,0 +1,32 @@
#ifndef __MLX_RENDERER_ENUMS__
#define __MLX_RENDERER_ENUMS__
namespace mlx
{
enum class BufferType
{
Constant = 0,
Staging,
HighDynamic, // typically stored in RAM
LowDynamic, // typically stored in VRAM
EndEnum
};
constexpr std::size_t BufferTypeCount = static_cast<std::size_t>(BufferType::EndEnum);
enum class ImageType
{
Color = 0,
EndEnum
};
constexpr std::size_t ImageTypeCount = static_cast<std::size_t>(ImageType::EndEnum);
enum class ShaderType
{
Vertex,
Fragment
};
}
#endif
+114
View File
@@ -0,0 +1,114 @@
#ifndef __MLX_IMAGE__
#define __MLX_IMAGE__
#include <Maths/Vec4.h>
#include <Renderer/RenderCore.h>
#include <Renderer/Buffer.h>
#include <Utils/Buffer.h>
#include <Renderer/Enums.h>
namespace mlx
{
class Image
{
public:
Image() = default;
inline void Init(VkImage image, VkFormat format, std::uint32_t width, std::uint32_t height, VkImageLayout layout, [[maybe_unused]] std::string_view debug_name) noexcept
{
m_image = image;
m_format = format;
m_width = width;
m_height = height;
m_layout = layout;
#ifdef DEBUG
m_debug_name = std::move(debug_name);
#endif
}
void Init(ImageType type, std::uint32_t width, std::uint32_t height, VkFormat format, VkImageTiling tiling, VkImageUsageFlags usage, bool is_multisampled, std::string_view debug_name);
void CreateImageView(VkImageViewType type, VkImageAspectFlags aspectFlags, int layer_count = 1) noexcept;
void CreateSampler() noexcept;
void TransitionLayout(VkImageLayout new_layout, VkCommandBuffer cmd = VK_NULL_HANDLE);
virtual void Clear(VkCommandBuffer cmd, Vec4f color);
void DestroySampler() noexcept;
void DestroyImageView() noexcept;
virtual void Destroy() noexcept;
[[nodiscard]] MLX_FORCEINLINE VkImage Get() const noexcept { return m_image; }
[[nodiscard]] MLX_FORCEINLINE VmaAllocation GetAllocation() const noexcept { return m_allocation; }
[[nodiscard]] MLX_FORCEINLINE VkImageView GetImageView() const noexcept { return m_image_view; }
[[nodiscard]] MLX_FORCEINLINE VkFormat GetFormat() const noexcept { return m_format; }
[[nodiscard]] MLX_FORCEINLINE VkImageTiling GetTiling() const noexcept { return m_tiling; }
[[nodiscard]] MLX_FORCEINLINE VkImageLayout GetLayout() const noexcept { return m_layout; }
[[nodiscard]] MLX_FORCEINLINE VkSampler GetSampler() const noexcept { return m_sampler; }
[[nodiscard]] MLX_FORCEINLINE std::uint32_t GetWidth() const noexcept { return m_width; }
[[nodiscard]] MLX_FORCEINLINE std::uint32_t GetHeight() const noexcept { return m_height; }
[[nodiscard]] MLX_FORCEINLINE bool IsInit() const noexcept { return m_image != VK_NULL_HANDLE; }
[[nodiscard]] MLX_FORCEINLINE ImageType GetType() const noexcept { return m_type; }
#ifdef DEBUG
[[nodiscard]] MLX_FORCEINLINE const std::string& GetDebugName() const { return m_debug_name; }
#endif
virtual ~Image() = default;
protected:
#ifdef DEBUG
std::string m_debug_name;
#endif
VmaAllocation m_allocation;
VkImage m_image = VK_NULL_HANDLE;
VkImageView m_image_view = VK_NULL_HANDLE;
VkSampler m_sampler = VK_NULL_HANDLE;
VkFormat m_format;
VkImageTiling m_tiling;
VkImageLayout m_layout = VK_IMAGE_LAYOUT_UNDEFINED;
ImageType m_type;
std::uint32_t m_width = 0;
std::uint32_t m_height = 0;
bool m_is_multisampled = false;
};
class Texture: public Image
{
public:
Texture() = default;
Texture(CPUBuffer pixels, std::uint32_t width, std::uint32_t height, VkFormat format, bool is_multisampled, [[maybe_unused]] std::string_view debug_name)
{
Init(std::move(pixels), width, height, format, is_multisampled, std::move(debug_name));
}
void Init(CPUBuffer pixels, std::uint32_t width, std::uint32_t height, VkFormat format, bool is_multisampled, [[maybe_unused]] std::string_view debug_name);
void Destroy() noexcept override;
void SetPixel(int x, int y, mlx_color color) noexcept;
void SetRegion(int x, int y, int w, int h, mlx_color* color) noexcept;
void SetLinearRegion(int x, int y, std::size_t len, mlx_color* color) noexcept;
mlx_color GetPixel(int x, int y) noexcept;
void GetRegion(int x, int y, int w, int h, mlx_color* dst) noexcept;
void Clear(VkCommandBuffer cmd, Vec4f color) override;
void CopyTo(Texture& other);
void Resize(std::uint32_t width, std::uint32_t height);
void Swap(Texture& texture) noexcept;
// If a valid cmd buffer is passed, this function takes ownership and makes it invalid after
void SyncCPUBuffer(VkCommandBuffer cmd = VK_NULL_HANDLE);
void Update(VkCommandBuffer cmd);
~Texture() override { Destroy(); }
private:
void OpenCPUBuffer();
private:
std::optional<GPUBuffer> m_staging_buffer;
bool m_has_been_modified = false;
};
Texture* StbTextureLoad(const std::filesystem::path& file, int* w, int* h);
}
#endif
+36
View File
@@ -0,0 +1,36 @@
#ifndef __MLX_VK_MEMORY__
#define __MLX_VK_MEMORY__
namespace mlx
{
class GPUAllocator
{
public:
GPUAllocator() = default;
void Init(const VkAllocationCallbacks* callbacks) noexcept;
void Destroy() noexcept;
VmaAllocation CreateBuffer(const VkBufferCreateInfo* binfo, const VmaAllocationCreateInfo* vinfo, VkBuffer& buffer, const char* name = nullptr) noexcept;
void DestroyBuffer(VmaAllocation allocation, VkBuffer buffer, const char* name) noexcept;
VmaAllocation CreateImage(const VkImageCreateInfo* iminfo, const VmaAllocationCreateInfo* vinfo, VkImage& image, const char* name = nullptr) noexcept;
void DestroyImage(VmaAllocation allocation, VkImage image, const char* name) noexcept;
void MapMemory(VmaAllocation allocation, void** data) noexcept;
void UnmapMemory(VmaAllocation allocation) noexcept;
void DumpMemoryToJson();
void Flush(VmaAllocation allocation, VkDeviceSize size, VkDeviceSize offset) noexcept;
~GPUAllocator() = default;
private:
VmaAllocator m_allocator;
std::int32_t m_active_buffers_allocations = 0;
std::int32_t m_active_images_allocations = 0;
};
}
#endif
@@ -0,0 +1,60 @@
#ifndef __MLX_GRAPHICS_PIPELINE__
#define __MLX_GRAPHICS_PIPELINE__
#include <Renderer/Image.h>
#include <Utils/NonOwningPtr.h>
#include <Renderer/Pipelines/Shader.h>
#include <Renderer/Pipelines/Pipeline.h>
namespace mlx
{
struct GraphicPipelineDescriptor
{
std::shared_ptr<Shader> vertex_shader;
std::shared_ptr<Shader> fragment_shader;
std::vector<NonOwningPtr<Texture>> color_attachments;
NonOwningPtr<class Renderer> renderer = nullptr;
bool clear_color_attachments = true;
bool no_vertex_inputs = false;
};
class GraphicPipeline : public Pipeline
{
public:
GraphicPipeline() = default;
void Init(const GraphicPipelineDescriptor& descriptor, std::string_view debug_name);
bool BindPipeline(VkCommandBuffer cmd, std::size_t framebuffer_index, std::array<float, 4> clear) noexcept;
void EndPipeline(VkCommandBuffer cmd) noexcept override;
void Destroy() noexcept;
[[nodiscard]] inline VkPipeline GetPipeline() const override { return m_pipeline; }
[[nodiscard]] inline VkPipelineLayout GetPipelineLayout() const override { return m_pipeline_layout; }
[[nodiscard]] inline VkPipelineBindPoint GetPipelineBindPoint() const override { return VK_PIPELINE_BIND_POINT_GRAPHICS; }
~GraphicPipeline() = default;
private:
void CreateFramebuffers(const std::vector<NonOwningPtr<Texture>>& render_targets, bool clear_attachments);
void TransitionAttachments(VkCommandBuffer cmd = VK_NULL_HANDLE);
// Private override to remove access
bool BindPipeline(VkCommandBuffer) noexcept override { return false; };
private:
std::vector<NonOwningPtr<Texture>> m_attachments;
std::vector<VkFramebuffer> m_framebuffers;
std::vector<VkClearValue> m_clears;
#ifdef DEBUG
std::string m_debug_name;
#endif
std::shared_ptr<Shader> p_vertex_shader;
std::shared_ptr<Shader> p_fragment_shader;
VkRenderPass m_renderpass = VK_NULL_HANDLE;
VkPipeline m_pipeline = VK_NULL_HANDLE;
VkPipelineLayout m_pipeline_layout = VK_NULL_HANDLE;
NonOwningPtr<class Renderer> p_renderer;
};
}
#endif
@@ -0,0 +1,22 @@
#ifndef __MLX_PIPELINE__
#define __MLX_PIPELINE__
namespace mlx
{
class Pipeline
{
public:
Pipeline() = default;
inline virtual bool BindPipeline(VkCommandBuffer command_buffer) noexcept { RenderCore::Get().vkCmdBindPipeline(command_buffer, GetPipelineBindPoint(), GetPipeline()); return true; }
inline virtual void EndPipeline([[maybe_unused]] VkCommandBuffer command_buffer) noexcept {}
virtual VkPipeline GetPipeline() const = 0;
virtual VkPipelineLayout GetPipelineLayout() const = 0;
virtual VkPipelineBindPoint GetPipelineBindPoint() const = 0;
virtual ~Pipeline() = default;
};
}
#endif

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