Fixed text vanishing when the transform is vertically flipped #601
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
memononen
requested changes
Dec 20, 2020
src/nanovg.c
Outdated
| @@ -2454,6 +2454,12 @@ static void nvg__renderText(NVGcontext* ctx, NVGvertex* verts, int nverts) | |||
| ctx->textTriCount += nverts/3; | |||
| } | |||
|
|
|||
| static int nvg__isTransformFlipped( const float *xform) | |||
There was a problem hiding this comment.
Please copy the formatting from the surrounding code. Function def and return.
src/nanovg.c
Outdated
| @@ -2464,6 +2470,8 @@ float nvgText(NVGcontext* ctx, float x, float y, const char* string, const char* | |||
| float invscale = 1.0f / scale; | |||
| int cverts = 0; | |||
| int nverts = 0; | |||
| int isFlipped; | |||
There was a problem hiding this comment.
set to nvg__isTransformFlipped( state->xform) directly here.
| @@ -2497,6 +2506,11 @@ float nvgText(NVGcontext* ctx, float x, float y, const char* string, const char* | |||
| break; | |||
| } | |||
| prevIter = iter; | |||
| if( isFlipped) | |||
| { | |||
| tmp = q.y0; q.y0 = q.y1; q.y1 = tmp; | |||
There was a problem hiding this comment.
Move tmp definition at the beginning of the block here.
src/nanovg.c
Outdated
| @@ -2497,6 +2506,11 @@ float nvgText(NVGcontext* ctx, float x, float y, const char* string, const char* | |||
| break; | |||
| } | |||
| prevIter = iter; | |||
| if( isFlipped) | |||
There was a problem hiding this comment.
space after if, not after paren, curly on the same line.
src/nanovg.c
Outdated
| @@ -2480,6 +2488,7 @@ float nvgText(NVGcontext* ctx, float x, float y, const char* string, const char* | |||
| verts = nvg__allocTempVerts(ctx, cverts); | |||
| if (verts == NULL) return x; | |||
|
|
|||
| isFlipped = nvg__isTransformFlipped( state->xform); | |||
|
Thanks for the fix! |
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
Fixes #600.