Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Text #443

Merged
merged 28 commits into from
Apr 26, 2020
Merged

Text #443

merged 28 commits into from
Apr 26, 2020

Conversation

AstraLuma
Copy link
Member

@AstraLuma AstraLuma commented Apr 21, 2020 •
edited
Loading

Implements basic text rending. No wrapping or rich text supported.

Depends on #432, #436

Closes #146

@AstraLuma
assetlib.py: Add DelayedThreadExecutor
9b9c905
@AstraLuma
assets: Add test for DelayedThreadExecutor
44eef0e
@AstraLuma
assetlib: start using DelayedThreadExecutor
00749f2
@AstraLuma
assets: Fix up how accounting is done.
c55b613
@AstraLuma
assets: add BackgroundAsset and Asset
05bd8bd
@AstraLuma
assets: Some refactoring
0bc2cf6
@AstraLuma
test_assets.py: Re-add the clean_assets fixture
445227f
@AstraLuma
assets: Keep load() and is_loaded() documented.
7c2811e
@AstraLuma
assetlib.py: Remove unused import
0c860cd
@AstraLuma
assetlib.py: Add MockFuture
5bdadaf
@AstraLuma
assetlib.py: Rewrite MockFuture to be based on Future
574d913 
With all the possible threading problems, it was just simpler
@AstraLuma
assetlib.py: Add ChainingMixin
d69e22e
@AstraLuma
assetlib.py: update __all__
9ee8f63
@AstraLuma
assetlib.py: remove unused force_background_thread
de570d8 
Using the executor instead
@AstraLuma
assets: Add chaining test
7401145
@AstraLuma
Move all SDL calling code to _sdl_utils
228f5bc
@AstraLuma
getting-started.rst: Add libsdl2-ttf to installation instructions
418608e
@AstraLuma
_sdl_utils.py: Add ttf calling
a67d5f7
@AstraLuma
renderer.py: Initialize SDL2_ttf
8abe515
@AstraLuma
cirrus: install libsdl2-ttf
a15ec68
@AstraLuma
Add ppb.systems.text and Font
fa8ce44
@AstraLuma
Implement Text
d2cf780 
Currently segfaults, which is super helpful.
@AstraLuma
text: keep the font RW object around, freetype needs it.
dca98ef
@AstraLuma
assetlib.py: rewrite how chaining works
b7394b4
@AstraLuma
Got SDL_ttf to stop crashing
df30409
@AstraLuma
Copy link
Member Author

AstraLuma commented Apr 21, 2020 •
edited
Loading

Ok, basic text rendering is done. Things not implemented:

  • render-time bold/italitc/underline/strikethrough (will do bold/italic if you're using a bold/italic font face)
  • outline rendering
  • hinting/kerning settings [Ed: I'm not convinced there's good reasons to disable hinting/kerning]

Note that this is the list of features provided by SDL_ttf, not the list of features we should have.

@AstraLuma AstraLuma marked this pull request as ready for review April 21, 2020 18:23
@AstraLuma AstraLuma requested a review from a team as a code owner April 21, 2020 18:23
pathunstrom
pathunstrom approved these changes Apr 26, 2020
View reviewed changes
Copy link
Collaborator

@pathunstrom pathunstrom left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. I have thoughts regarding system font support, but doesn't need to hold this up.

bors r+

bors bot added a commit that referenced this pull request Apr 26, 2020
@bors @AstraLuma
Merge #443
babf53d 
443: Text r=pathunstrom a=astronouth7303

Implements basic text rending. No wrapping or rich text supported.

Depends on #432, #436 

Closes #146 

Co-authored-by: Jamie Bliss <jamie@ivyleav.es>
@bors
Copy link
Contributor

bors bot commented Apr 26, 2020

Build failed:

@pathunstrom
Copy link
Collaborator

bors retry

@bors
Copy link
Contributor

bors bot commented Apr 26, 2020

Build succeeded:

@bors bors bot merged commit 92a2a20 into ppb:master Apr 26, 2020
@AstraLuma AstraLuma deleted the text branch May 11, 2020 23:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pathunstrom pathunstrom pathunstrom approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Text Sprites
2 participants
@AstraLuma @pathunstrom