Small clean ups #1717
Merged
Small clean ups #1717
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
ffreyer
reviewed
Mar 3, 2022
src/camera/projection_math.jl
Outdated
Comment on lines
319
to
331
| function space_to_clip_obs(cam::Camera, space::Symbol, projectionview::Bool) | ||
| if is_data_space(space) | ||
| cam.projectionview[] | ||
| return projectionview ? cam.projectionview : cam.projection | ||
| elseif is_pixel_space(space) | ||
| cam.pixel_space[] | ||
| return cam.pixel_space | ||
| elseif is_relative_space(space) | ||
| Mat4f(2, 0, 0, 0, 0, 2, 0, 0, 0, 0, 1, 0, -1, -1, 0, 1) | ||
| return Mat4f(2, 0, 0, 0, 0, 2, 0, 0, 0, 0, 1, 0, -1, -1, 0, 1) | ||
| elseif is_clip_space(space) | ||
| Mat4f(I) | ||
| return Mat4f(I) | ||
| else | ||
| error("Space $space not recognized. Must be one of $(spaces())") | ||
| end | ||
| end |
There was a problem hiding this comment.
Relative and clip space should also return observables
There was a problem hiding this comment.
Actually, it seems the observable version isn't needed... I'll remove it
ffreyer
reviewed
Mar 3, 2022
GLMakie/src/drawing_primitives.jl
Outdated
Comment on lines
65
to
70
| get!(gl_attributes, :projection) do | ||
| Makie.space_to_clip_obs(cam, space[], false) | ||
| return map(cam.projection, space) do _, space | ||
| return Makie.space_to_clip(cam, space, true) | ||
| end | ||
| end |
There was a problem hiding this comment.
The matrix here can be cam.projection or cam.pixel_space so it should trigger on both of those and space. Also seems like you didn't update this correctly
There was a problem hiding this comment.
I think for 2d, 3d and pixel cameras reacting to pixelspace isn't necessary but for RelativeCamera it would be?
There was a problem hiding this comment.
hm, for simplicity I'll just add pixel_space to it for now...
The right way to do this is hard to express with observables... I need to think about a cleaner way going forward...
ffreyer
approved these changes
Mar 3, 2022
SimonDanisch
added a commit
that referenced
this pull request
Mar 4, 2022
* use markerspace::Symbol for text and scatter * adjust camera matrices based on space * only include data space plots in limits * add is_data_space etc * update text * cleanup markerspace * markerspace for scatter * fix interactivity * add default marker/-space * add efault space * get WGLMakie working * fix heatmap * fix tests * fix typo * get CairoMakie working * fix circle marker transform * add 2D space+markerspace tests * fix mesh3D space * add 3D space test * fix poly and band * change space to markerspace * fix rotations * fix 1.3 test error? * fix 1.3 * fix 1.3 error * add space attribute * cleanup comments * add news entry * add documentation for space * add tests for space * fix typo * move preprojection into shaders * minor cleanup * remove deleted import * fix test * clarify comment * Small clean ups (#1717) * remove overly eager optimizations (#1713) * small clean ups * clean up implementation a bit, use only one name for space * address review * fix usage of space_to_clip * fix cairomakie * fix fastpixel and add tests Co-authored-by: Simon <sdanisch@protonmail.com>
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.
Will add some more clean ups tomorrow