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

Rebased version of beta 0.20 #3113

Merged
merged 164 commits into from
Nov 17, 2023
Merged

Rebased version of beta 0.20 #3113

merged 164 commits into from
Nov 17, 2023

Conversation

SimonDanisch
Copy link
Member

@SimonDanisch SimonDanisch commented Aug 1, 2023 •
edited
Loading

Continues #2831 !
Still needs to check, if I rebased correctly and didn't incorrectly apply some of the changes!

Merged PRs

TODOS

  • fix flaky test @test GLMakie.window_size(screen.glscreen) == scaled(screen, (W, H))
  • Merge axis type inferences from breaking-release combined #2220
  • Test on different resolution screens, IJulia, Pluto, VSCode, Windowed
  • rebase to only have merge commits from the PRs
  • investigate unexpected speed ups
  • reset camera settings from tests
  • check doc image generation
  • rethink default near/far in Camera3D (compatability with OIT)
  • merge Implement multiple lights and more Light types #3246
  • fix WGLMakie issues/tests:
    • fix line depth issues (see tests: hexbin colorrange (not new), LaTeXStrings in Axis3, Axis3 axis reversal)
    • fix lighting of surface with nan points (fixed in Implement multiple lights and more Light types #3246)
    • volume/3D contour artifacts (see 3D Contour with 2D contour slices) not new
    • artifacting in "colorscale (lines)" not new
  • GLMakie:
    • slight outline in "scatter image markers" test
    • clipping/z-fighting in "volume translated" not new
  • CairoMakie:
    • Artfiacting in `colorscale (lines)" not new
    • markersize in "scatter rotations" changed? not new
    • color change in "colorscale (poly)" not new
    • transparency/render order of "OldAxis + Surface" not new
    • render order in "Merged color mesh" not new
    • render order of "Surface + wireframe + contour" not new
  • Check "SpecApi in convert_arguments" (colors swapped?)

Fixes the following errors

jkrumbiegel and others added 6 commits August 1, 2023 10:51
@jkrumbiegel @SimonDanisch
squash merge jw/gl_linux_hidpi
b1d9d63
@SimonDanisch
Fix mesh/surface with NaN points #2598
56cda4c 
commit 2a0da7e
Merge: 338441e 07496e9
Author: Frederic Freyer <[email protected]>
Date:   Tue Jul 11 15:52:45 2023 +0200

    Merge branch 'master' into as/cairomakie_surface_nan

commit 338441e
Merge: 4e44a6b fb1f7f7
Author: Simon <[email protected]>
Date:   Wed Apr 5 15:51:02 2023 +0200

    Merge branch 'master' into as/cairomakie_surface_nan

commit 4e44a6b
Merge: 598ad24 91a036d
Author: SimonDanisch <[email protected]>
Date:   Wed Mar 29 21:21:39 2023 +0200

    Merge branch 'master' into as/cairomakie_surface_nan

commit 598ad24
Merge: 7682d0b b108c4d
Author: Anshul Singhvi <[email protected]>
Date:   Wed Mar 29 21:18:42 2023 +0530

    Merge branch 'master' into as/cairomakie_surface_nan

commit 7682d0b
Merge: d82fb0e 939c5a5
Author: Anshul Singhvi <[email protected]>
Date:   Wed Mar 15 06:53:21 2023 +0530

    Merge branch 'master' into as/cairomakie_surface_nan

commit d82fb0e
Merge: 8e79b41 576bbb9
Author: Frederic Freyer <[email protected]>
Date:   Tue Mar 14 16:40:36 2023 +0100

    Merge branch 'master' into as/cairomakie_surface_nan

commit 8e79b41
Author: ffreyer <[email protected]>
Date:   Sun Jan 29 20:44:22 2023 +0100

    use texelFetch for normal calc

commit aa551be
Merge: 8e00d10 8a2bc5d
Author: ffreyer <[email protected]>
Date:   Sun Jan 29 01:37:28 2023 +0100

    Merge branch 'master' into as/cairomakie_surface_nan

commit 8e00d10
Author: ffreyer <[email protected]>
Date:   Sun Jan 29 01:24:11 2023 +0100

    simplify test

commit 7ef034c
Author: ffreyer <[email protected]>
Date:   Sun Jan 29 01:08:41 2023 +0100

    fix the wrong uv instead

commit 2af2845
Author: ffreyer <[email protected]>
Date:   Sat Jan 28 21:46:35 2023 +0100

    fix WGLMakie surfaces

commit db0e400
Author: ffreyer <[email protected]>
Date:   Sat Jan 28 16:38:50 2023 +0100

    fix NaN value rendering in GLMakie

commit d6452c9
Merge: 8fb0706 07c5f61
Author: Simon <[email protected]>
Date:   Fri Jan 27 15:18:58 2023 +0100

    Merge branch 'master' into as/cairomakie_surface_nan

commit 8fb0706
Merge: 4c2e4b4 19a4401
Author: Anshul Singhvi <[email protected]>
Date:   Fri Jan 27 08:32:02 2023 +0530

    Merge branch 'master' into as/cairomakie_surface_nan

commit 4c2e4b4
Author: Frederic Freyer <[email protected]>
Date:   Tue Jan 24 19:48:30 2023 +0100

    fix test

commit 9402fce
Author: Anshul Singhvi <[email protected]>
Date:   Thu Jan 19 08:01:14 2023 +0530

    Add a better test

    Co-committed-by: Frederic Freyer <[email protected]>

commit fd93548
Author: ffreyer <[email protected]>
Date:   Tue Jan 17 16:42:18 2023 +0100

    simplify orthogonal_vector and avoid triangles in surface

commit 3313da0
Author: Anshul Singhvi <[email protected]>
Date:   Mon Jan 16 21:03:20 2023 +0530

    Complete the switch to Makie

commit c6725f6
Author: Anshul Singhvi <[email protected]>
Date:   Mon Jan 16 21:02:58 2023 +0530

    Finally fix tests

    removed an extra 'end'

commit 9b14ec3
Author: Anshul Singhvi <[email protected]>
Date:   Mon Jan 16 21:02:45 2023 +0530

    Move functionality from CairoMakie to Makie

commit 5978840
Author: Anshul Singhvi <[email protected]>
Date:   Mon Jan 16 20:25:16 2023 +0530

    Fix typo

commit dd60f10
Author: Anshul Singhvi <[email protected]>
Date:   Mon Jan 16 19:20:15 2023 +0530

    Add a test

commit 5440a23
Author: Anshul Singhvi <[email protected]>
Date:   Mon Jan 16 19:20:08 2023 +0530

    Apply nan code only to surfaces, not meshes

    Simplify the code a lot as well.

commit ce2a22b
Author: Anshul Singhvi <[email protected]>
Date:   Mon Jan 16 16:26:32 2023 +0530

    Add NaN-aware normal calculation code

    Basically replicates what's done in GLMakie's utils shader.  Skips any combination of points which has a NaN when computing normals.

commit d817155
Author: Anshul Singhvi <[email protected]>
Date:   Mon Jan 16 12:27:02 2023 +0530

    Skip NaN faces in the other mesh methods also

commit 079c553
Author: Anshul Singhvi <[email protected]>
Date:   Sun Jan 15 21:15:14 2023 +0530

    Update NEWS.md

commit a5cd052
Author: Anshul Singhvi <[email protected]>
Date:   Sun Jan 15 21:05:07 2023 +0530

    Do not plot faces with NaN points in meshes

    Also allows NaN points to propagate ahead from surface to mesh.

    Solves https://www.github.com/MakieOrg/GeoMakie.jl/issues/133
@SimonDanisch
Camera3D Improvements #2746
79839c5 
commit 12bcc1c
Merge: 01b1589 f3bb1c8
Author: Simon <[email protected]>
Date:   Tue Aug 1 11:03:08 2023 +0200

    Merge branch 'master' into ff/camera

commit 01b1589
Merge: 98c1096 07496e9
Author: ffreyer <[email protected]>
Date:   Wed Jul 12 18:07:07 2023 +0200

    Merge branch 'master' into ff/camera

commit 98c1096
Author: ffreyer <[email protected]>
Date:   Tue Jul 4 21:26:00 2023 +0200

    fix test errors

commit 34e9072
Merge: 001542e eaf1028
Author: Frederic Freyer <[email protected]>
Date:   Tue Jul 4 18:46:07 2023 +0200

    Merge branch 'master' into ff/camera

commit 001542e
Author: ffreyer <[email protected]>
Date:   Tue Jul 4 18:25:09 2023 +0200

    avoid centering on unrelated plots

commit d89aac0
Author: ffreyer <[email protected]>
Date:   Tue Jul 4 18:24:22 2023 +0200

    Merge branch 'master' into ff/camera

commit 381eb82
Merge: a26e6a1 8ccb6bd
Author: Frederic Freyer <[email protected]>
Date:   Thu Jun 22 14:31:02 2023 +0200

    Merge branch 'master' into ff/camera

commit a26e6a1
Author: ffreyer <[email protected]>
Date:   Mon Jun 12 13:45:21 2023 +0200

    check other ray_at_cursor methods

commit fc4fcd5
Author: ffreyer <[email protected]>
Date:   Mon Jun 12 13:45:01 2023 +0200

    fix type error in cam2d!

commit fd9a04d
Merge: 64f7730 5f96457
Author: ffreyer <[email protected]>
Date:   Mon Jun 12 13:19:06 2023 +0200

    Merge branch 'master' into ff/camera

commit 64f7730
Author: ffreyer <[email protected]>
Date:   Fri May 5 15:32:02 2023 +0200

    consider transforms when centering on plot object

commit 6972303
Merge: 10aff36 13e1d84
Author: Simon <[email protected]>
Date:   Tue Apr 25 16:03:43 2023 +0200

    Merge branch 'master' into ff/camera

commit 10aff36
Author: ffreyer <[email protected]>
Date:   Sun Apr 23 21:10:30 2023 +0200

    update docs

commit 1053b3a
Author: ffreyer <[email protected]>
Date:   Sun Apr 23 18:47:33 2023 +0200

    update NEWS

commit 6945b97
Author: ffreyer <[email protected]>
Date:   Sun Apr 23 18:23:42 2023 +0200

    fix line indicator in band

commit fdc3666
Author: ffreyer <[email protected]>
Date:   Sun Apr 23 13:27:07 2023 +0200

    fix wrong tooltip in volumeslices

commit d51ed11
Author: ffreyer <[email protected]>
Date:   Sun Apr 23 10:45:40 2023 +0200

    DataInspector fixes

    - fix error on range access for lines
    - fix a typo
    - fix blinking in image
    - fix error in arrows

commit a7e819b
Author: ffreyer <[email protected]>
Date:   Sat Apr 22 00:54:00 2023 +0200

    add on-click refocus of camera

commit 78ee1e5
Author: ffreyer <[email protected]>
Date:   Wed Apr 19 21:52:04 2023 +0200

    improve default controls/hotkeys

commit a72abbd
Merge: 43e6428 bc13edb
Author: Simon <[email protected]>
Date:   Wed Apr 19 14:30:27 2023 +0200

    Merge branch 'master' into ff/camera

commit 43e6428
Author: ffreyer <[email protected]>
Date:   Tue Mar 28 17:21:09 2023 +0200

    cleanup news

commit ed48aa6
Merge: 6594406 cdad6dd
Author: ffreyer <[email protected]>
Date:   Tue Mar 28 17:20:34 2023 +0200

    Merge branch 'master' into ff/camera

commit 6594406
Author: ffreyer <[email protected]>
Date:   Tue Mar 28 17:20:28 2023 +0200

    fix whitespace?

commit 87e7254
Author: ffreyer <[email protected]>
Date:   Sun Mar 19 16:28:45 2023 +0100

    deprecate old_cam [skip ci]

commit f264360
Author: ffreyer <[email protected]>
Date:   Sun Mar 19 16:04:24 2023 +0100

    bring back fov controls

commit becc8cd
Author: ffreyer <[email protected]>
Date:   Sun Mar 19 15:49:28 2023 +0100

    add center in orbital update_cam!

commit d6639fc
Author: ffreyer <[email protected]>
Date:   Sun Mar 19 15:28:48 2023 +0100

    bring back perspective zoom_shift_lookat

commit c890d34
Author: ffreyer <[email protected]>
Date:   Sun Mar 19 15:09:00 2023 +0100

    update NEWS

commit 4fee98b
Merge: 5274295 4bebd86
Author: ffreyer <[email protected]>
Date:   Sun Mar 19 15:00:39 2023 +0100

    Merge branch 'master' into ff/camera

commit 5274295
Author: ffreyer <[email protected]>
Date:   Thu Mar 16 18:46:30 2023 +0100

    Add update_cam! with angles

commit 6786f96
Author: ffreyer <[email protected]>
Date:   Wed Mar 15 17:53:18 2023 +0100

    tweak default zoom some more

commit 3c22c47
Author: ffreyer <[email protected]>
Date:   Wed Mar 15 15:41:27 2023 +0100

    fix zoom and switch back to more extreme near/far

commit 8185a96
Author: ffreyer <[email protected]>
Date:   Mon Mar 13 01:09:17 2023 +0100

    update tests

commit d31d905
Author: ffreyer <[email protected]>
Date:   Mon Mar 13 00:56:41 2023 +0100

    update docs

commit ae7f89a
Author: ffreyer <[email protected]>
Date:   Mon Mar 13 00:34:04 2023 +0100

    fix docstring [skip ci]

commit 4de5fa3
Author: ffreyer <[email protected]>
Date:   Mon Mar 13 00:15:11 2023 +0100

    switch back rotation order to avoid change in upvector

commit 11313dc
Author: ffreyer <[email protected]>
Date:   Mon Mar 13 00:03:05 2023 +0100

    cleanup docstring

commit 3e07289
Author: ffreyer <[email protected]>
Date:   Sun Mar 12 23:37:22 2023 +0100

    update test values

commit b54c0ae
Author: ffreyer <[email protected]>
Date:   Sun Mar 12 20:00:54 2023 +0100

    remove enable translation/rotation/zoom

    can be achieved by removing hotkeys

commit 6cbca9e
Author: ffreyer <[email protected]>
Date:   Sun Mar 12 19:55:32 2023 +0100

    add example

commit e4b056a
Author: ffreyer <[email protected]>
Date:   Sun Mar 12 19:46:57 2023 +0100

    fix typo

commit 066f0b7
Author: ffreyer <[email protected]>
Date:   Sun Mar 12 19:23:35 2023 +0100

    switch back to translation zoom, cleanup/reorganize
@jkrumbiegel @SimonDanisch
merge jk/html-png-display + highdpi adjustments
e933fbd 
new figure size and related theming adjustments

move html backend show out of cairomakie

move WEB_MIMES constant from WGLMakie into Makie

use strings again

fix test

smaller colorbar ticks

adjust more theming gaps

padding adjust

fix size of docs example

make toggle smaller

make colorbar thinner

smaller colorbar

adjust legend doc example

fix intervalslider and example

more docs fixes, axis legend padding

improve faq example

fix test value
@ffreyer @SimonDanisch
Fix errors and bugs
6a4f605 
remove yield

try colorbuffer() to fix test error

try fixing line AA scaling
@SimonDanisch
early attr conversion + no proxy scene anymore #3082
2859548 
commit 67e436d
Author: SimonDanisch <[email protected]>
Date:   Mon Jul 31 18:00:55 2023 +0200

    small cleanups

commit a38091f
Author: SimonDanisch <[email protected]>
Date:   Mon Jul 31 15:52:39 2023 +0200

    small clean ups

commit 97cfc01
Author: SimonDanisch <[email protected]>
Date:   Thu Jul 27 16:27:04 2023 +0200

    fix theming

commit f31b4ab
Author: SimonDanisch <[email protected]>
Date:   Thu Jul 27 14:14:59 2023 +0200

    fix WGLMakie

commit 2067612
Author: SimonDanisch <[email protected]>
Date:   Thu Jul 27 13:16:45 2023 +0200

    fix WGLMakie

commit 3172c6a
Author: SimonDanisch <[email protected]>
Date:   Thu Jul 27 12:48:12 2023 +0200

    fix last tests

commit 786c55c
Author: SimonDanisch <[email protected]>
Date:   Wed Jul 26 17:49:39 2023 +0200

    try to fix cycling

commit 3f2aee8
Author: SimonDanisch <[email protected]>
Date:   Wed Jul 26 15:28:06 2023 +0200

    bring back error messages

commit d352d9f
Author: SimonDanisch <[email protected]>
Date:   Wed Jul 26 11:57:36 2023 +0200

    fix Makie tests

commit b95b72b
Author: SimonDanisch <[email protected]>
Date:   Tue Jul 25 15:40:36 2023 +0200

    address frederics code review

commit ee1728d
Author: SimonDanisch <[email protected]>
Date:   Tue Jul 25 15:38:51 2023 +0200

    fix performance?!?!

commit 22488bf
Author: SimonDanisch <[email protected]>
Date:   Mon Jul 24 18:15:39 2023 +0200

    add back precompiles

commit ee5e570
Author: SimonDanisch <[email protected]>
Date:   Mon Jul 24 18:14:55 2023 +0200

    fix PlotSpec

commit 64576ce
Author: SimonDanisch <[email protected]>
Date:   Mon Jul 24 17:24:07 2023 +0200

    fix GLMakie tests

commit 0196af5
Merge: bb2f665 04f6704
Author: SimonDanisch <[email protected]>
Date:   Mon Jul 24 11:51:25 2023 +0200

    Merge branch 'master' into sd/early-attribute-conversion

commit bb2f665
Author: SimonDanisch <[email protected]>
Date:   Mon Jul 24 11:51:10 2023 +0200

    dont use plotspec

commit dc205a1
Author: SimonDanisch <[email protected]>
Date:   Sat Jul 22 14:48:19 2023 +0200

    fix precompilation

commit 017372f
Author: SimonDanisch <[email protected]>
Date:   Sat Jul 22 13:35:21 2023 +0200

    remove erroring precompiles

commit 79c5294
Merge: cfeb4e6 2bdd105
Author: SimonDanisch <[email protected]>
Date:   Sat Jul 22 12:06:49 2023 +0200

    Merge branch 'sd/early-attribute-conversion' of https://github.com/MakieOrg/Makie.jl into sd/early-attribute-conversion

commit cfeb4e6
Author: SimonDanisch <[email protected]>
Date:   Sat Jul 22 12:04:47 2023 +0200

    fix CairoMakie

commit 2bdd105
Merge: 8d87ca7 aab593f
Author: Simon <[email protected]>
Date:   Sat Jul 22 11:38:56 2023 +0200

    Merge branch 'master' into sd/early-attribute-conversion

commit 8d87ca7
Author: SimonDanisch <[email protected]>
Date:   Sat Jul 22 11:30:09 2023 +0200

    fix most issues

commit eb4a42d
Author: SimonDanisch <[email protected]>
Date:   Sat Jul 22 10:12:50 2023 +0200

    first plot showing

commit 76a3f3d
Author: SimonDanisch <[email protected]>
Date:   Sat Jul 22 09:26:14 2023 +0200

    try to get things running

commit d5d457c
Author: SimonDanisch <[email protected]>
Date:   Thu Jul 20 15:42:26 2023 +0200

    try to get things working

commit 8674156
Author: SimonDanisch <[email protected]>
Date:   Thu Jul 20 14:03:41 2023 +0200

    get code from breaking branch
@SimonDanisch SimonDanisch changed the title Rebased version of beta 20 Rebased version of beta 0.20 Aug 1, 2023
@MakieBot
Copy link
Collaborator

MakieBot commented Aug 1, 2023 •
edited
Loading

Compile Times benchmark

Note, that these numbers may fluctuate on the CI servers, so take them with a grain of salt. All benchmark results are based on the mean time and negative percent mean faster than the base branch. Note, that GLMakie + WGLMakie run on an emulated GPU, so the runtime benchmark is much slower. Results are from running:

using_time = @ctime using Backend
# Compile time
create_time = @ctime fig = scatter(1:4; color=1:4, colormap=:turbo, markersize=20, visible=true)
display_time = @ctime Makie.colorbuffer(display(fig))
# Runtime
create_time = @benchmark fig = scatter(1:4; color=1:4, colormap=:turbo, markersize=20, visible=true)
display_time = @benchmark Makie.colorbuffer(display(fig))
using create display create display
GLMakie 3.37s (3.35, 3.38) 0.01+- 335.94ms (312.35, 385.91) 33.96+- 585.96ms (541.04, 714.00) 73.32+- 7.25ms (7.18, 7.29) 0.04+- 25.21ms (25.16, 25.25) 0.03+-
master 3.39s (3.38, 3.41) 0.01+- 964.90ms (957.40, 974.52) 6.47+- 799.12ms (785.19, 840.96) 18.96+- 7.67ms (7.61, 7.76) 0.05+- 25.28ms (25.25, 25.32) 0.03+-
evaluation 1.01x faster ✓, -0.02s (-2.04d, 0.00p, 0.01std) 2.87x faster✅, -628.97ms (-25.73d, 0.00p, 20.22std) 1.36x faster✅, -213.15ms (-3.98d, 0.00p, 46.14std) 1.06x faster✅, -0.41ms (-9.30d, 0.00p, 0.04std) 1.00x faster ✓, -0.07ms (-2.49d, 0.00p, 0.03std)
CairoMakie 2.99s (2.97, 3.03) 0.02+- 328.24ms (326.14, 330.72) 1.48+- 145.84ms (144.86, 146.48) 0.60+- 7.42ms (7.33, 7.50) 0.06+- 600.17μs (595.04, 604.68) 3.43+-
master 3.00s (2.96, 3.08) 0.05+- 757.14ms (742.31, 767.66) 9.07+- 339.09ms (333.74, 342.19) 2.68+- 8.09ms (8.01, 8.18) 0.06+- 698.49μs (679.28, 711.96) 10.17+-
evaluation 1.00x invariant, -0.01s (-0.16d, 0.77p, 0.03std) 2.31x faster✅, -428.89ms (-65.98d, 0.00p, 5.28std) 2.33x faster✅, -193.25ms (-99.55d, 0.00p, 1.64std) 1.09x faster✅, -0.67ms (-10.57d, 0.00p, 0.06std) 1.16x faster✅, -98.32μs (-12.96d, 0.00p, 6.80std)
WGLMakie 3.65s (3.63, 3.67) 0.01+- 334.04ms (330.57, 339.04) 3.10+- 8.68s (8.61, 8.73) 0.04+- 9.64ms (9.44, 10.65) 0.44+- 69.77ms (67.91, 77.93) 3.62+-
master 3.65s (3.63, 3.69) 0.02+- 2.06s (2.04, 2.07) 0.01+- 8.64s (8.56, 8.76) 0.07+- 10.03ms (9.84, 10.26) 0.16+- 69.55ms (67.46, 73.64) 2.24+-
evaluation 1.00x invariant, -0.01s (-0.33d, 0.55p, 0.02std) 6.17x faster✅, -1725.58ms (-193.52d, 0.00p, 7.66std) 1.00x invariant, 0.04s (0.66d, 0.25p, 0.05std) 1.04x invariant, -0.39ms (-1.16d, 0.06p, 0.30std) 1.00x invariant, 0.22ms (0.07d, 0.89p, 2.93std)

@github-actions
Copy link
Contributor

github-actions bot commented Aug 1, 2023

Missing reference images

Found 2 new images without existing references.
Upload new reference images before merging this PR.

SimonDanisch
SimonDanisch commented Aug 1, 2023
View reviewed changes
CairoMakie/src/screen.jl
@@ -81,8 +81,8 @@ end
to_cairo_antialias(aa::Int) = aa

"""
* `px_per_unit = 2.0`: see [figure docs](https://docs.makie.org/stable/documentation/figure/).
* `pt_per_unit = 0.75`: see [figure docs](https://docs.makie.org/stable/documentation/figure/).
* `px_per_unit = 2.0`: see [figure docs](https://docs.makie.org/stable/documentation/figure_size/).
Copy link
Member Author

Choose a reason for hiding this comment

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

@jkrumbiegel I guess this is the old url and should be figure now? Or is this the correct fix?

Copy link
Member

Choose a reason for hiding this comment

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

hm that page does exist and in principle contains the right info. But I feel like I have rewritten that section at some point to explain the new changes. Or haven't I? It was too long ago..

Copy link
Member

Choose a reason for hiding this comment

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

ah the github interface for some reason didn't show the right changes, ok yeah I see now that I deleted that page in the refactor. So yeah link needs to be fixed

@ffreyer
Copy link
Collaborator

ffreyer commented Aug 1, 2023

I would like to get #3106 in here too so we don't have two releases messing with the visuals of surface.

@SimonDanisch
Copy link
Member Author

Yes, definitely! We also should merge #2756 as part of that!

jkrumbiegel and others added 9 commits August 8, 2023 20:18
@jkrumbiegel @SimonDanisch
squash merge jw/gl_linux_hidpi
d20bf7a
@SimonDanisch
Fix mesh/surface with NaN points #2598
f8f3436 
commit 2a0da7e
Merge: 338441e 07496e9
Author: Frederic Freyer <[email protected]>
Date:   Tue Jul 11 15:52:45 2023 +0200

    Merge branch 'master' into as/cairomakie_surface_nan

commit 338441e
Merge: 4e44a6b fb1f7f7
Author: Simon <[email protected]>
Date:   Wed Apr 5 15:51:02 2023 +0200

    Merge branch 'master' into as/cairomakie_surface_nan

commit 4e44a6b
Merge: 598ad24 91a036d
Author: SimonDanisch <[email protected]>
Date:   Wed Mar 29 21:21:39 2023 +0200

    Merge branch 'master' into as/cairomakie_surface_nan

commit 598ad24
Merge: 7682d0b b108c4d
Author: Anshul Singhvi <[email protected]>
Date:   Wed Mar 29 21:18:42 2023 +0530

    Merge branch 'master' into as/cairomakie_surface_nan

commit 7682d0b
Merge: d82fb0e 939c5a5
Author: Anshul Singhvi <[email protected]>
Date:   Wed Mar 15 06:53:21 2023 +0530

    Merge branch 'master' into as/cairomakie_surface_nan

commit d82fb0e
Merge: 8e79b41 576bbb9
Author: Frederic Freyer <[email protected]>
Date:   Tue Mar 14 16:40:36 2023 +0100

    Merge branch 'master' into as/cairomakie_surface_nan

commit 8e79b41
Author: ffreyer <[email protected]>
Date:   Sun Jan 29 20:44:22 2023 +0100

    use texelFetch for normal calc

commit aa551be
Merge: 8e00d10 8a2bc5d
Author: ffreyer <[email protected]>
Date:   Sun Jan 29 01:37:28 2023 +0100

    Merge branch 'master' into as/cairomakie_surface_nan

commit 8e00d10
Author: ffreyer <[email protected]>
Date:   Sun Jan 29 01:24:11 2023 +0100

    simplify test

commit 7ef034c
Author: ffreyer <[email protected]>
Date:   Sun Jan 29 01:08:41 2023 +0100

    fix the wrong uv instead

commit 2af2845
Author: ffreyer <[email protected]>
Date:   Sat Jan 28 21:46:35 2023 +0100

    fix WGLMakie surfaces

commit db0e400
Author: ffreyer <[email protected]>
Date:   Sat Jan 28 16:38:50 2023 +0100

    fix NaN value rendering in GLMakie

commit d6452c9
Merge: 8fb0706 07c5f61
Author: Simon <[email protected]>
Date:   Fri Jan 27 15:18:58 2023 +0100

    Merge branch 'master' into as/cairomakie_surface_nan

commit 8fb0706
Merge: 4c2e4b4 19a4401
Author: Anshul Singhvi <[email protected]>
Date:   Fri Jan 27 08:32:02 2023 +0530

    Merge branch 'master' into as/cairomakie_surface_nan

commit 4c2e4b4
Author: Frederic Freyer <[email protected]>
Date:   Tue Jan 24 19:48:30 2023 +0100

    fix test

commit 9402fce
Author: Anshul Singhvi <[email protected]>
Date:   Thu Jan 19 08:01:14 2023 +0530

    Add a better test

    Co-committed-by: Frederic Freyer <[email protected]>

commit fd93548
Author: ffreyer <[email protected]>
Date:   Tue Jan 17 16:42:18 2023 +0100

    simplify orthogonal_vector and avoid triangles in surface

commit 3313da0
Author: Anshul Singhvi <[email protected]>
Date:   Mon Jan 16 21:03:20 2023 +0530

    Complete the switch to Makie

commit c6725f6
Author: Anshul Singhvi <[email protected]>
Date:   Mon Jan 16 21:02:58 2023 +0530

    Finally fix tests

    removed an extra 'end'

commit 9b14ec3
Author: Anshul Singhvi <[email protected]>
Date:   Mon Jan 16 21:02:45 2023 +0530

    Move functionality from CairoMakie to Makie

commit 5978840
Author: Anshul Singhvi <[email protected]>
Date:   Mon Jan 16 20:25:16 2023 +0530

    Fix typo

commit dd60f10
Author: Anshul Singhvi <[email protected]>
Date:   Mon Jan 16 19:20:15 2023 +0530

    Add a test

commit 5440a23
Author: Anshul Singhvi <[email protected]>
Date:   Mon Jan 16 19:20:08 2023 +0530

    Apply nan code only to surfaces, not meshes

    Simplify the code a lot as well.

commit ce2a22b
Author: Anshul Singhvi <[email protected]>
Date:   Mon Jan 16 16:26:32 2023 +0530

    Add NaN-aware normal calculation code

    Basically replicates what's done in GLMakie's utils shader.  Skips any combination of points which has a NaN when computing normals.

commit d817155
Author: Anshul Singhvi <[email protected]>
Date:   Mon Jan 16 12:27:02 2023 +0530

    Skip NaN faces in the other mesh methods also

commit 079c553
Author: Anshul Singhvi <[email protected]>
Date:   Sun Jan 15 21:15:14 2023 +0530

    Update NEWS.md

commit a5cd052
Author: Anshul Singhvi <[email protected]>
Date:   Sun Jan 15 21:05:07 2023 +0530

    Do not plot faces with NaN points in meshes

    Also allows NaN points to propagate ahead from surface to mesh.

    Solves https://www.github.com/MakieOrg/GeoMakie.jl/issues/133
@SimonDanisch
Camera3D Improvements #2746
819d823 
commit 12bcc1c
Merge: 01b1589 f3bb1c8
Author: Simon <[email protected]>
Date:   Tue Aug 1 11:03:08 2023 +0200

    Merge branch 'master' into ff/camera

commit 01b1589
Merge: 98c1096 07496e9
Author: ffreyer <[email protected]>
Date:   Wed Jul 12 18:07:07 2023 +0200

    Merge branch 'master' into ff/camera

commit 98c1096
Author: ffreyer <[email protected]>
Date:   Tue Jul 4 21:26:00 2023 +0200

    fix test errors

commit 34e9072
Merge: 001542e eaf1028
Author: Frederic Freyer <[email protected]>
Date:   Tue Jul 4 18:46:07 2023 +0200

    Merge branch 'master' into ff/camera

commit 001542e
Author: ffreyer <[email protected]>
Date:   Tue Jul 4 18:25:09 2023 +0200

    avoid centering on unrelated plots

commit d89aac0
Author: ffreyer <[email protected]>
Date:   Tue Jul 4 18:24:22 2023 +0200

    Merge branch 'master' into ff/camera

commit 381eb82
Merge: a26e6a1 8ccb6bd
Author: Frederic Freyer <[email protected]>
Date:   Thu Jun 22 14:31:02 2023 +0200

    Merge branch 'master' into ff/camera

commit a26e6a1
Author: ffreyer <[email protected]>
Date:   Mon Jun 12 13:45:21 2023 +0200

    check other ray_at_cursor methods

commit fc4fcd5
Author: ffreyer <[email protected]>
Date:   Mon Jun 12 13:45:01 2023 +0200

    fix type error in cam2d!

commit fd9a04d
Merge: 64f7730 5f96457
Author: ffreyer <[email protected]>
Date:   Mon Jun 12 13:19:06 2023 +0200

    Merge branch 'master' into ff/camera

commit 64f7730
Author: ffreyer <[email protected]>
Date:   Fri May 5 15:32:02 2023 +0200

    consider transforms when centering on plot object

commit 6972303
Merge: 10aff36 13e1d84
Author: Simon <[email protected]>
Date:   Tue Apr 25 16:03:43 2023 +0200

    Merge branch 'master' into ff/camera

commit 10aff36
Author: ffreyer <[email protected]>
Date:   Sun Apr 23 21:10:30 2023 +0200

    update docs

commit 1053b3a
Author: ffreyer <[email protected]>
Date:   Sun Apr 23 18:47:33 2023 +0200

    update NEWS

commit 6945b97
Author: ffreyer <[email protected]>
Date:   Sun Apr 23 18:23:42 2023 +0200

    fix line indicator in band

commit fdc3666
Author: ffreyer <[email protected]>
Date:   Sun Apr 23 13:27:07 2023 +0200

    fix wrong tooltip in volumeslices

commit d51ed11
Author: ffreyer <[email protected]>
Date:   Sun Apr 23 10:45:40 2023 +0200

    DataInspector fixes

    - fix error on range access for lines
    - fix a typo
    - fix blinking in image
    - fix error in arrows

commit a7e819b
Author: ffreyer <[email protected]>
Date:   Sat Apr 22 00:54:00 2023 +0200

    add on-click refocus of camera

commit 78ee1e5
Author: ffreyer <[email protected]>
Date:   Wed Apr 19 21:52:04 2023 +0200

    improve default controls/hotkeys

commit a72abbd
Merge: 43e6428 bc13edb
Author: Simon <[email protected]>
Date:   Wed Apr 19 14:30:27 2023 +0200

    Merge branch 'master' into ff/camera

commit 43e6428
Author: ffreyer <[email protected]>
Date:   Tue Mar 28 17:21:09 2023 +0200

    cleanup news

commit ed48aa6
Merge: 6594406 cdad6dd
Author: ffreyer <[email protected]>
Date:   Tue Mar 28 17:20:34 2023 +0200

    Merge branch 'master' into ff/camera

commit 6594406
Author: ffreyer <[email protected]>
Date:   Tue Mar 28 17:20:28 2023 +0200

    fix whitespace?

commit 87e7254
Author: ffreyer <[email protected]>
Date:   Sun Mar 19 16:28:45 2023 +0100

    deprecate old_cam [skip ci]

commit f264360
Author: ffreyer <[email protected]>
Date:   Sun Mar 19 16:04:24 2023 +0100

    bring back fov controls

commit becc8cd
Author: ffreyer <[email protected]>
Date:   Sun Mar 19 15:49:28 2023 +0100

    add center in orbital update_cam!

commit d6639fc
Author: ffreyer <[email protected]>
Date:   Sun Mar 19 15:28:48 2023 +0100

    bring back perspective zoom_shift_lookat

commit c890d34
Author: ffreyer <[email protected]>
Date:   Sun Mar 19 15:09:00 2023 +0100

    update NEWS

commit 4fee98b
Merge: 5274295 4bebd86
Author: ffreyer <[email protected]>
Date:   Sun Mar 19 15:00:39 2023 +0100

    Merge branch 'master' into ff/camera

commit 5274295
Author: ffreyer <[email protected]>
Date:   Thu Mar 16 18:46:30 2023 +0100

    Add update_cam! with angles

commit 6786f96
Author: ffreyer <[email protected]>
Date:   Wed Mar 15 17:53:18 2023 +0100

    tweak default zoom some more

commit 3c22c47
Author: ffreyer <[email protected]>
Date:   Wed Mar 15 15:41:27 2023 +0100

    fix zoom and switch back to more extreme near/far

commit 8185a96
Author: ffreyer <[email protected]>
Date:   Mon Mar 13 01:09:17 2023 +0100

    update tests

commit d31d905
Author: ffreyer <[email protected]>
Date:   Mon Mar 13 00:56:41 2023 +0100

    update docs

commit ae7f89a
Author: ffreyer <[email protected]>
Date:   Mon Mar 13 00:34:04 2023 +0100

    fix docstring [skip ci]

commit 4de5fa3
Author: ffreyer <[email protected]>
Date:   Mon Mar 13 00:15:11 2023 +0100

    switch back rotation order to avoid change in upvector

commit 11313dc
Author: ffreyer <[email protected]>
Date:   Mon Mar 13 00:03:05 2023 +0100

    cleanup docstring

commit 3e07289
Author: ffreyer <[email protected]>
Date:   Sun Mar 12 23:37:22 2023 +0100

    update test values

commit b54c0ae
Author: ffreyer <[email protected]>
Date:   Sun Mar 12 20:00:54 2023 +0100

    remove enable translation/rotation/zoom

    can be achieved by removing hotkeys

commit 6cbca9e
Author: ffreyer <[email protected]>
Date:   Sun Mar 12 19:55:32 2023 +0100

    add example

commit e4b056a
Author: ffreyer <[email protected]>
Date:   Sun Mar 12 19:46:57 2023 +0100

    fix typo

commit 066f0b7
Author: ffreyer <[email protected]>
Date:   Sun Mar 12 19:23:35 2023 +0100

    switch back to translation zoom, cleanup/reorganize
@jkrumbiegel @SimonDanisch
merge jk/html-png-display + highdpi adjustments
76803fc 
new figure size and related theming adjustments

move html backend show out of cairomakie

move WEB_MIMES constant from WGLMakie into Makie

use strings again

fix test

smaller colorbar ticks

adjust more theming gaps

padding adjust

fix size of docs example

make toggle smaller

make colorbar thinner

smaller colorbar

adjust legend doc example

fix intervalslider and example

more docs fixes, axis legend padding

improve faq example

fix test value
@ffreyer @SimonDanisch
Fix errors and bugs
5fb4809 
remove yield

try colorbuffer() to fix test error

try fixing line AA scaling
@SimonDanisch
early attr conversion + no proxy scene anymore #3082
8c16d51 
commit 67e436d
Author: SimonDanisch <[email protected]>
Date:   Mon Jul 31 18:00:55 2023 +0200

    small cleanups

commit a38091f
Author: SimonDanisch <[email protected]>
Date:   Mon Jul 31 15:52:39 2023 +0200

    small clean ups

commit 97cfc01
Author: SimonDanisch <[email protected]>
Date:   Thu Jul 27 16:27:04 2023 +0200

    fix theming

commit f31b4ab
Author: SimonDanisch <[email protected]>
Date:   Thu Jul 27 14:14:59 2023 +0200

    fix WGLMakie

commit 2067612
Author: SimonDanisch <[email protected]>
Date:   Thu Jul 27 13:16:45 2023 +0200

    fix WGLMakie

commit 3172c6a
Author: SimonDanisch <[email protected]>
Date:   Thu Jul 27 12:48:12 2023 +0200

    fix last tests

commit 786c55c
Author: SimonDanisch <[email protected]>
Date:   Wed Jul 26 17:49:39 2023 +0200

    try to fix cycling

commit 3f2aee8
Author: SimonDanisch <[email protected]>
Date:   Wed Jul 26 15:28:06 2023 +0200

    bring back error messages

commit d352d9f
Author: SimonDanisch <[email protected]>
Date:   Wed Jul 26 11:57:36 2023 +0200

    fix Makie tests

commit b95b72b
Author: SimonDanisch <[email protected]>
Date:   Tue Jul 25 15:40:36 2023 +0200

    address frederics code review

commit ee1728d
Author: SimonDanisch <[email protected]>
Date:   Tue Jul 25 15:38:51 2023 +0200

    fix performance?!?!

commit 22488bf
Author: SimonDanisch <[email protected]>
Date:   Mon Jul 24 18:15:39 2023 +0200

    add back precompiles

commit ee5e570
Author: SimonDanisch <[email protected]>
Date:   Mon Jul 24 18:14:55 2023 +0200

    fix PlotSpec

commit 64576ce
Author: SimonDanisch <[email protected]>
Date:   Mon Jul 24 17:24:07 2023 +0200

    fix GLMakie tests

commit 0196af5
Merge: bb2f665 04f6704
Author: SimonDanisch <[email protected]>
Date:   Mon Jul 24 11:51:25 2023 +0200

    Merge branch 'master' into sd/early-attribute-conversion

commit bb2f665
Author: SimonDanisch <[email protected]>
Date:   Mon Jul 24 11:51:10 2023 +0200

    dont use plotspec

commit dc205a1
Author: SimonDanisch <[email protected]>
Date:   Sat Jul 22 14:48:19 2023 +0200

    fix precompilation

commit 017372f
Author: SimonDanisch <[email protected]>
Date:   Sat Jul 22 13:35:21 2023 +0200

    remove erroring precompiles

commit 79c5294
Merge: cfeb4e6 2bdd105
Author: SimonDanisch <[email protected]>
Date:   Sat Jul 22 12:06:49 2023 +0200

    Merge branch 'sd/early-attribute-conversion' of https://github.com/MakieOrg/Makie.jl into sd/early-attribute-conversion

commit cfeb4e6
Author: SimonDanisch <[email protected]>
Date:   Sat Jul 22 12:04:47 2023 +0200

    fix CairoMakie

commit 2bdd105
Merge: 8d87ca7 aab593f
Author: Simon <[email protected]>
Date:   Sat Jul 22 11:38:56 2023 +0200

    Merge branch 'master' into sd/early-attribute-conversion

commit 8d87ca7
Author: SimonDanisch <[email protected]>
Date:   Sat Jul 22 11:30:09 2023 +0200

    fix most issues

commit eb4a42d
Author: SimonDanisch <[email protected]>
Date:   Sat Jul 22 10:12:50 2023 +0200

    first plot showing

commit 76a3f3d
Author: SimonDanisch <[email protected]>
Date:   Sat Jul 22 09:26:14 2023 +0200

    try to get things running

commit d5d457c
Author: SimonDanisch <[email protected]>
Date:   Thu Jul 20 15:42:26 2023 +0200

    try to get things working

commit 8674156
Author: SimonDanisch <[email protected]>
Date:   Thu Jul 20 14:03:41 2023 +0200

    get code from breaking branch
@SimonDanisch
add remaining changes from beta-0.20
030ee50
@SimonDanisch
dont be unfair to master
d0141a8
@SimonDanisch
use same resolution as master
7148081
ffreyer
ffreyer reviewed Aug 9, 2023
View reviewed changes
GLMakie/test/unit_tests.jl
# save with a different resolution
save(file, fig, px_per_unit = 2)
img = load(file)
@test size(img) == (2W, 2H)
Copy link
Collaborator

Choose a reason for hiding this comment

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

This fails for me locally now.

  Expression: size(img) == (2W, 2H)
   Evaluated: (400, 400) == (800, 800)

@SimonDanisch SimonDanisch force-pushed the sd/beta-20 branch 2 times, most recently from 010b27e to ee4f0cd Compare August 16, 2023 15:52
@SimonDanisch SimonDanisch mentioned this pull request Nov 16, 2023
Closed
1 task
@Sagnac Sagnac mentioned this pull request Nov 16, 2023
Closed
@SimonDanisch SimonDanisch merged commit 090a3fb into master Nov 17, 2023
15 checks passed
@SimonDanisch SimonDanisch deleted the sd/beta-20 branch November 17, 2023 15:17
This was referenced Nov 17, 2023
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
@ffreyer ffreyer mentioned this pull request Dec 27, 2023
Closed
@ffreyer ffreyer mentioned this pull request Feb 19, 2024
Closed
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jkrumbiegel jkrumbiegel jkrumbiegel left review comments

@ffreyer ffreyer ffreyer left review comments

@Moelf Moelf Moelf left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
8 participants
@SimonDanisch @MakieBot @ffreyer @lazarusA @Moelf @jkrumbiegel @asinghvi17 @ErickChacon