Glyph atlas preparations #18
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 15 commits
January 8, 2019 22:35
This reverts commit b81b946.
4 tasks
bryphe
reviewed
Jan 26, 2019
| @@ -37,7 +47,8 @@ let run = () => { | |||
| glfwMakeContextCurrent(w); | |||
| glViewport(0, 0, 800, 600); | |||
|
|
|||
| let%lwt font = Fontkit.load("Roboto-Regular.ttf", 24); | |||
| let%lwt font = | |||
| Fontkit.load(getExecutingDirectory() ++ "Roboto-Regular.ttf", 24); | |||
There was a problem hiding this comment.
So nice to be able to use esy x for this too, nice!
bryphe
reviewed
Jan 26, 2019
| FT_Bitmap bitmap = face->glyph->bitmap; | ||
| int bitmapDataLength = bitmap.rows * abs(bitmap.pitch); | ||
| bitmapBigarray = caml_ba_alloc_dims(CAML_BA_UINT8 | CAML_BA_C_LAYOUT, 2, NULL, bitmap.rows, abs(bitmap.pitch)); | ||
| memcpy(Caml_ba_data_val(bitmapBigarray), (const char *)bitmap.buffer, bitmapDataLength); |
There was a problem hiding this comment.
Excellent! That's great that we can copy directly into the Bigarray buffer vs allocated an extra one. Nice find 👍
bryphe
reviewed
Jan 26, 2019
| @@ -1,18 +0,0 @@ | |||
|
|
|||
| extern "C" { | |||
There was a problem hiding this comment.
Ah this was duplicated between the projects - nice to see it go away!
bryphe
approved these changes
Jan 26, 2019
* API: Add 'fk_get_metrics' API (#20) Add 'fk_get_metrics' API * 2.1.0 * Upgrade reason-glfw -> 3.2.1015 (#21) * Use hb_blob_create_from_file for mmap file reading (#19) Not tested locally however. * 2.2.0 * Add /opt/local/lib to link path (#22) * 2.2.1 * Update fontkit.cpp * Bring back iSize * Debugging * Get working on Windows * Add bitmap back
|
Thanks for your work here, @manuhornung ! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR is required for revery-ui/revery#53
TODO: Fixate minimum
reason-glfwversion once we know it, i.e. after https://github.com/bryphe/reason-glfw/pull/87 has been mergedBigarray.Array2s to allow access to the raw pixels