-
-
Notifications
You must be signed in to change notification settings - Fork 313
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.
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
Split marker_offset from quad_offset #4594
Open
ffreyer
wants to merge
17
commits into
master
Choose a base branch
from
ff/marker_offset
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
+206
−83
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
Benchmark ResultsSHA: 272a41db69c1d331cb0f8a7982e5842310a0b700 Warning These results are subject to substantial noise because GitHub's CI runs on shared machines that are not ideally suited for benchmarking. |
I'd consider this a bug fix |
… into ff/marker_offset
This is ready for review |
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.
Description
For
text
we have:char_offset
which gives the position of each character relative to the string anchor pointquad_offset
which gives places the rectangle containing the char relative to the character positionThe user
offset
is included inchar_offset
. Both act in markerspace, thoughquad_offset
also includes billboarding.This pr effective translates this behavior to scatter. It now always centers, i.e. does the equivalent to character layouting under the hood, and considers
marker_offset
a pure user attribute. This removes the need forMakie.jl/src/interfaces.jl
Lines 66 to 71 in 66c32da
in calculated_attributes, and it also fixes some niche errors:
Changes:
rotation
. (Sorotation = pi/2
doesn't turn(x, 0)
into a translation in y direction) (GLMakie, WGLMakie)Fixes #4383
Refimg before & after
2D no rotation
FastPixel is expected to be square in GLMakie, falls back onto Rect for other backends
2D with billboarded rotation
Skipped FastPixel as it doesn't support rotation
3D with Quaternion rotation
Everything is wrong in CairoMakie here, especially with
space = :data
. I assume fixing this requires reworking the scatter code at a larger scale, so I didn't bother with it here. Some placements improved regardless though.Attribute Example
Type of change
Could be considered breaking as
marker_offset = Vec2f(0, 0)
is now a centered marker instead of a bottom-left aligned marker. But with BezierPath, i.e. default markers not working with marker_offset we could also consider marker_offset to not really be supported right now.Checklist