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.

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

Camera3D Improvements #2746

Closed
wants to merge 42 commits into from
Closed

Camera3D Improvements #2746

wants to merge 42 commits into from

Conversation

ffreyer
Copy link
Collaborator

@ffreyer ffreyer commented Mar 12, 2023

Description

Some general camera improvements/changes

Breaking

  • revert the switch to fov based zoom. Camera3D now uses the same zoom style as old_cam3d! again, i.e. translating eyeposition.
    • to keep clipping issues (Zooming without entering shape #602, Camera weirdness #941) from occurring near and far are now relative to norm(eyeposition - lookat), i.e. the zoom level.
    • because of this stretch/contract view hotkeys have been removed as they are equivalent to zoom in/out. The old zoom in/out is now available as increase/decrease fov.
  • Separate attributes into cam.controls for hotkeys and cam.settings for everything else

Non-breaking

  • make near & far relative to norm(eyeposition - lookat), i.e. zoom level
  • scale translations with zoom level and fov. This normalizes the perceived translation speed
  • scale camera centering on bounding boxes with fov. This makes the full bbox visible at a larger range of fovs.
  • add orbital `update_cam!(scene, cam, phi, theta[, radius, center])
  • add deprecation warning for old_cam3d! etc. Camera3D can now reproduce this, though not exactly due to QoL tweaks.
  • improve default hotkey choices
  • add functionality to focus camera on a point on a plot

Fixes #2721, #1600, #1236 (y/z swap, documentation)

DataInspector fixes

I moved a bunch of code around that's also used by DataInspector so I did some testing and fixing on that too. Most of these fixes are probably not related to this pr.

  • fixed error related to getindex_sv(::Range, idx)
  • fixed blinking in image inspection
  • fixed typos in arrows (closes callback error in arrows data inspection #2764) & lines(egments)
  • fixed incorrect values when inspecting volumeslices
  • fixed incorrect indicator placement in lines and added workaround to avoid multiple indicators

Type of change

Breaking change

Checklist

  • Added an entry in NEWS.md (for new features and breaking changes)
  • Added or changed relevant sections in the documentation
  • Check DataInspector
  • Document changes to ispressed

@MakieBot
Copy link
Collaborator

MakieBot commented Mar 12, 2023

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 13.80s (13.40, 14.94) 0.52+- 1.25s (1.19, 1.36) 0.05+- 898.28ms (851.63, 968.95) 45.53+- 15.99ms (15.63, 16.51) 0.31+- 186.82ms (184.07, 191.12) 2.71+-
master 13.66s (13.46, 14.02) 0.18+- 1.26s (1.24, 1.34) 0.04+- 888.78ms (861.61, 910.68) 14.67+- 15.92ms (15.70, 16.08) 0.13+- 185.27ms (183.09, 191.02) 2.81+-
evaluation +1.01%, 0.14s invariant (0.36d, 0.52p, 0.35std) -0.95%, -0.01s invariant (-0.26d, 0.64p, 0.04std) +1.06%, 9.51ms invariant (0.28d, 0.61p, 30.10std) +0.43%, 0.07ms invariant (0.29d, 0.60p, 0.22std) +0.83%, 1.54ms invariant (0.56d, 0.32p, 2.76std)
CairoMakie 9.73s (9.58, 9.80) 0.09+- 1.03s (1.00, 1.04) 0.01+- 222.56ms (219.16, 225.33) 2.13+- 9.59ms (9.47, 9.70) 0.09+- 5.72ms (5.59, 5.80) 0.08+-
master 9.72s (9.47, 9.88) 0.15+- 1.02s (0.99, 1.04) 0.02+- 234.61ms (229.58, 238.54) 3.35+- 9.61ms (9.49, 9.76) 0.11+- 5.77ms (5.66, 5.91) 0.09+-
evaluation +0.09%, 0.01s invariant (0.07d, 0.89p, 0.12std) +0.40%, 0.0s invariant (0.26d, 0.63p, 0.02std) -5.41%, -12.04ms faster✅ (-4.29d, 0.00p, 2.74std) -0.27%, -0.03ms invariant (-0.25d, 0.64p, 0.10std) -0.74%, -0.04ms invariant (-0.48d, 0.39p, 0.09std)
WGLMakie 15.54s (15.23, 15.91) 0.21+- 1.42s (1.36, 1.48) 0.04+- 14.09s (13.92, 14.24) 0.11+- 16.46ms (16.10, 17.05) 0.32+- 1.38s (1.31, 1.43) 0.04+-
master 15.45s (15.26, 15.69) 0.13+- 1.42s (1.40, 1.44) 0.02+- 13.95s (13.89, 14.03) 0.05+- 16.86ms (15.64, 17.75) 0.69+- 1.38s (1.35, 1.41) 0.02+-
evaluation +0.53%, 0.08s invariant (0.47d, 0.40p, 0.17std) -0.10%, -0.0s invariant (-0.05d, 0.93p, 0.03std) +1.02%, 0.14s slower X (1.69d, 0.01p, 0.08std) -2.43%, -0.4ms invariant (-0.74d, 0.20p, 0.51std) +0.35%, 0.0s invariant (0.14d, 0.80p, 0.03std)

@ffreyer ffreyer changed the title Update Camera3D Camera3D Improvements Mar 12, 2023
@ffreyer
Copy link
Collaborator Author

ffreyer commented Mar 13, 2023

It would be good to get some feedback on how these changes feel or if there's anything else worth adding to make the 3D camera feel better.

For example I think that for orthographic cameras things are disappearing too quickly.

@ffreyer
Copy link
Collaborator Author

ffreyer commented Mar 15, 2023

Refimg tests all look fine. The differences should all just be minor changes in the zoom level from center!()

@ffreyer
Copy link
Collaborator Author

ffreyer commented Mar 19, 2023

At default fov the only major difference between old_cam3d! and cam3d! I can notice is that translations are too fast for the old one (around default zoom). Since the old cam doesn't scale translation speed with zoom this will get more different when changing fov. (Same with cad = true)

I think Camera3D is pretty much just a better, more feature rich version of old_cam3d! now.

Regarding tests - there are some small differences in the default zoom level I believe, which only GLMakie tests catch. So nothing to worry about.

@ffreyer ffreyer marked this pull request as ready for review March 19, 2023 15:41
@asinghvi17
Copy link
Member

I just tried this on mac with touchpad, felt pretty good overall but some speeds definitely needed adjusting for trackpad.

Rotations were way to fast, and zoom was way too slow. What worked for me was:

cam = cameracontrols(ax.scene)
cam.settings.mouse_rotationspeed[] = 0.5
cam.settings.mouse_zoomspeed[] = 2

which made things a lot more responsive.

@ffreyer
Copy link
Collaborator Author

ffreyer commented Mar 23, 2023

Touchpad Windows: I agree, your defaults feel better
Mouse (same) Windows: Rotation speed is ok either way I think, zoomspeed feels better at 1 for me.
Mouse Linux: I feel like rotationspeed = 1 is already on the slow side and zoomspeed = 2 is on the faster side.

It seems like mouse speed is roughly 1:2 between windows and linux for me - matching that 0.5 factor. With a scatter(rand(Point3f, 10)) I can do a 360° rotation by moving the cursor 1 window width with about 1.5 rotationspeed on linux and about 0.75 on windows. Not sure if that's a sane default to aim at, but maybe it helps normalizing things across OS's?

For zooming I think it's very dependent on trackpad vs mouse, which we can't really tell apart 🙁

@ffreyer
Copy link
Collaborator Author

ffreyer commented Apr 23, 2023

Alright I went through and tested DataInspector. I fixed a bunch of small issues which were probably unrelated.

The errors in GLMakie are related to minor changes in the default camera position/zoom. The GLMakie specific tests have higher precision and notice this, the normal refiimages do not. I adjusted the camera interaction tests in Makie with new numbers so that those don't fail.

I still need to make a few tweaks to documentation. After that this will be ready to merge again.

@ffreyer ffreyer mentioned this pull request May 11, 2023
14 tasks
@@ -65,6 +65,7 @@ end
markersize=size,
axis = (; scenekw = (;limits=Rect3f(Point3(0), Point3(1))))
)
update_cam!(ax.scene, Point3f(2.224431, 2.224431, 2.128731), Point3f(0.5957, 0.5957, 0.50000006))
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I hard coded the camera setup here (and below) to avoid test errors. I don't know if we want to keep this or update refimgs so I'm pointing it out. The difference is tiny.

@github-actions
Copy link
Contributor

github-actions bot commented Aug 1, 2023

Missing reference images

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

SimonDanisch added a commit that referenced this pull request Aug 1, 2023
commit 12bcc1c
Merge: 01b1589 f3bb1c8
Author: Simon <sdanisch@protonmail.com>
Date:   Tue Aug 1 11:03:08 2023 +0200

    Merge branch 'master' into ff/camera

commit 01b1589
Merge: 98c1096 07496e9
Author: ffreyer <frederic481994@hotmail.de>
Date:   Wed Jul 12 18:07:07 2023 +0200

    Merge branch 'master' into ff/camera

commit 98c1096
Author: ffreyer <frederic481994@hotmail.de>
Date:   Tue Jul 4 21:26:00 2023 +0200

    fix test errors

commit 34e9072
Merge: 001542e eaf1028
Author: Frederic Freyer <frederic481994@hotmail.de>
Date:   Tue Jul 4 18:46:07 2023 +0200

    Merge branch 'master' into ff/camera

commit 001542e
Author: ffreyer <frederic481994@hotmail.de>
Date:   Tue Jul 4 18:25:09 2023 +0200

    avoid centering on unrelated plots

commit d89aac0
Author: ffreyer <frederic481994@hotmail.de>
Date:   Tue Jul 4 18:24:22 2023 +0200

    Merge branch 'master' into ff/camera

commit 381eb82
Merge: a26e6a1 8ccb6bd
Author: Frederic Freyer <frederic481994@hotmail.de>
Date:   Thu Jun 22 14:31:02 2023 +0200

    Merge branch 'master' into ff/camera

commit a26e6a1
Author: ffreyer <frederic481994@hotmail.de>
Date:   Mon Jun 12 13:45:21 2023 +0200

    check other ray_at_cursor methods

commit fc4fcd5
Author: ffreyer <frederic481994@hotmail.de>
Date:   Mon Jun 12 13:45:01 2023 +0200

    fix type error in cam2d!

commit fd9a04d
Merge: 64f7730 5f96457
Author: ffreyer <frederic481994@hotmail.de>
Date:   Mon Jun 12 13:19:06 2023 +0200

    Merge branch 'master' into ff/camera

commit 64f7730
Author: ffreyer <frederic481994@hotmail.de>
Date:   Fri May 5 15:32:02 2023 +0200

    consider transforms when centering on plot object

commit 6972303
Merge: 10aff36 13e1d84
Author: Simon <sdanisch@protonmail.com>
Date:   Tue Apr 25 16:03:43 2023 +0200

    Merge branch 'master' into ff/camera

commit 10aff36
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Apr 23 21:10:30 2023 +0200

    update docs

commit 1053b3a
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Apr 23 18:47:33 2023 +0200

    update NEWS

commit 6945b97
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Apr 23 18:23:42 2023 +0200

    fix line indicator in band

commit fdc3666
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Apr 23 13:27:07 2023 +0200

    fix wrong tooltip in volumeslices

commit d51ed11
Author: ffreyer <frederic481994@hotmail.de>
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 <frederic481994@hotmail.de>
Date:   Sat Apr 22 00:54:00 2023 +0200

    add on-click refocus of camera

commit 78ee1e5
Author: ffreyer <frederic481994@hotmail.de>
Date:   Wed Apr 19 21:52:04 2023 +0200

    improve default controls/hotkeys

commit a72abbd
Merge: 43e6428 bc13edb
Author: Simon <sdanisch@protonmail.com>
Date:   Wed Apr 19 14:30:27 2023 +0200

    Merge branch 'master' into ff/camera

commit 43e6428
Author: ffreyer <frederic481994@hotmail.de>
Date:   Tue Mar 28 17:21:09 2023 +0200

    cleanup news

commit ed48aa6
Merge: 6594406 cdad6dd
Author: ffreyer <frederic481994@hotmail.de>
Date:   Tue Mar 28 17:20:34 2023 +0200

    Merge branch 'master' into ff/camera

commit 6594406
Author: ffreyer <frederic481994@hotmail.de>
Date:   Tue Mar 28 17:20:28 2023 +0200

    fix whitespace?

commit 87e7254
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Mar 19 16:28:45 2023 +0100

    deprecate old_cam [skip ci]

commit f264360
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Mar 19 16:04:24 2023 +0100

    bring back fov controls

commit becc8cd
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Mar 19 15:49:28 2023 +0100

    add center in orbital update_cam!

commit d6639fc
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Mar 19 15:28:48 2023 +0100

    bring back perspective zoom_shift_lookat

commit c890d34
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Mar 19 15:09:00 2023 +0100

    update NEWS

commit 4fee98b
Merge: 5274295 4bebd86
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Mar 19 15:00:39 2023 +0100

    Merge branch 'master' into ff/camera

commit 5274295
Author: ffreyer <frederic481994@hotmail.de>
Date:   Thu Mar 16 18:46:30 2023 +0100

    Add update_cam! with angles

commit 6786f96
Author: ffreyer <frederic481994@hotmail.de>
Date:   Wed Mar 15 17:53:18 2023 +0100

    tweak default zoom some more

commit 3c22c47
Author: ffreyer <frederic481994@hotmail.de>
Date:   Wed Mar 15 15:41:27 2023 +0100

    fix zoom and switch back to more extreme near/far

commit 8185a96
Author: ffreyer <frederic481994@hotmail.de>
Date:   Mon Mar 13 01:09:17 2023 +0100

    update tests

commit d31d905
Author: ffreyer <frederic481994@hotmail.de>
Date:   Mon Mar 13 00:56:41 2023 +0100

    update docs

commit ae7f89a
Author: ffreyer <frederic481994@hotmail.de>
Date:   Mon Mar 13 00:34:04 2023 +0100

    fix docstring [skip ci]

commit 4de5fa3
Author: ffreyer <frederic481994@hotmail.de>
Date:   Mon Mar 13 00:15:11 2023 +0100

    switch back rotation order to avoid change in upvector

commit 11313dc
Author: ffreyer <frederic481994@hotmail.de>
Date:   Mon Mar 13 00:03:05 2023 +0100

    cleanup docstring

commit 3e07289
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Mar 12 23:37:22 2023 +0100

    update test values

commit b54c0ae
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Mar 12 20:00:54 2023 +0100

    remove enable translation/rotation/zoom

    can be achieved by removing hotkeys

commit 6cbca9e
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Mar 12 19:55:32 2023 +0100

    add example

commit e4b056a
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Mar 12 19:46:57 2023 +0100

    fix typo

commit 066f0b7
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Mar 12 19:23:35 2023 +0100

    switch back to translation zoom, cleanup/reorganize
@SimonDanisch SimonDanisch mentioned this pull request Aug 1, 2023
16 tasks
SimonDanisch added a commit that referenced this pull request Aug 8, 2023
commit 12bcc1c
Merge: 01b1589 f3bb1c8
Author: Simon <sdanisch@protonmail.com>
Date:   Tue Aug 1 11:03:08 2023 +0200

    Merge branch 'master' into ff/camera

commit 01b1589
Merge: 98c1096 07496e9
Author: ffreyer <frederic481994@hotmail.de>
Date:   Wed Jul 12 18:07:07 2023 +0200

    Merge branch 'master' into ff/camera

commit 98c1096
Author: ffreyer <frederic481994@hotmail.de>
Date:   Tue Jul 4 21:26:00 2023 +0200

    fix test errors

commit 34e9072
Merge: 001542e eaf1028
Author: Frederic Freyer <frederic481994@hotmail.de>
Date:   Tue Jul 4 18:46:07 2023 +0200

    Merge branch 'master' into ff/camera

commit 001542e
Author: ffreyer <frederic481994@hotmail.de>
Date:   Tue Jul 4 18:25:09 2023 +0200

    avoid centering on unrelated plots

commit d89aac0
Author: ffreyer <frederic481994@hotmail.de>
Date:   Tue Jul 4 18:24:22 2023 +0200

    Merge branch 'master' into ff/camera

commit 381eb82
Merge: a26e6a1 8ccb6bd
Author: Frederic Freyer <frederic481994@hotmail.de>
Date:   Thu Jun 22 14:31:02 2023 +0200

    Merge branch 'master' into ff/camera

commit a26e6a1
Author: ffreyer <frederic481994@hotmail.de>
Date:   Mon Jun 12 13:45:21 2023 +0200

    check other ray_at_cursor methods

commit fc4fcd5
Author: ffreyer <frederic481994@hotmail.de>
Date:   Mon Jun 12 13:45:01 2023 +0200

    fix type error in cam2d!

commit fd9a04d
Merge: 64f7730 5f96457
Author: ffreyer <frederic481994@hotmail.de>
Date:   Mon Jun 12 13:19:06 2023 +0200

    Merge branch 'master' into ff/camera

commit 64f7730
Author: ffreyer <frederic481994@hotmail.de>
Date:   Fri May 5 15:32:02 2023 +0200

    consider transforms when centering on plot object

commit 6972303
Merge: 10aff36 13e1d84
Author: Simon <sdanisch@protonmail.com>
Date:   Tue Apr 25 16:03:43 2023 +0200

    Merge branch 'master' into ff/camera

commit 10aff36
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Apr 23 21:10:30 2023 +0200

    update docs

commit 1053b3a
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Apr 23 18:47:33 2023 +0200

    update NEWS

commit 6945b97
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Apr 23 18:23:42 2023 +0200

    fix line indicator in band

commit fdc3666
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Apr 23 13:27:07 2023 +0200

    fix wrong tooltip in volumeslices

commit d51ed11
Author: ffreyer <frederic481994@hotmail.de>
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 <frederic481994@hotmail.de>
Date:   Sat Apr 22 00:54:00 2023 +0200

    add on-click refocus of camera

commit 78ee1e5
Author: ffreyer <frederic481994@hotmail.de>
Date:   Wed Apr 19 21:52:04 2023 +0200

    improve default controls/hotkeys

commit a72abbd
Merge: 43e6428 bc13edb
Author: Simon <sdanisch@protonmail.com>
Date:   Wed Apr 19 14:30:27 2023 +0200

    Merge branch 'master' into ff/camera

commit 43e6428
Author: ffreyer <frederic481994@hotmail.de>
Date:   Tue Mar 28 17:21:09 2023 +0200

    cleanup news

commit ed48aa6
Merge: 6594406 cdad6dd
Author: ffreyer <frederic481994@hotmail.de>
Date:   Tue Mar 28 17:20:34 2023 +0200

    Merge branch 'master' into ff/camera

commit 6594406
Author: ffreyer <frederic481994@hotmail.de>
Date:   Tue Mar 28 17:20:28 2023 +0200

    fix whitespace?

commit 87e7254
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Mar 19 16:28:45 2023 +0100

    deprecate old_cam [skip ci]

commit f264360
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Mar 19 16:04:24 2023 +0100

    bring back fov controls

commit becc8cd
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Mar 19 15:49:28 2023 +0100

    add center in orbital update_cam!

commit d6639fc
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Mar 19 15:28:48 2023 +0100

    bring back perspective zoom_shift_lookat

commit c890d34
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Mar 19 15:09:00 2023 +0100

    update NEWS

commit 4fee98b
Merge: 5274295 4bebd86
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Mar 19 15:00:39 2023 +0100

    Merge branch 'master' into ff/camera

commit 5274295
Author: ffreyer <frederic481994@hotmail.de>
Date:   Thu Mar 16 18:46:30 2023 +0100

    Add update_cam! with angles

commit 6786f96
Author: ffreyer <frederic481994@hotmail.de>
Date:   Wed Mar 15 17:53:18 2023 +0100

    tweak default zoom some more

commit 3c22c47
Author: ffreyer <frederic481994@hotmail.de>
Date:   Wed Mar 15 15:41:27 2023 +0100

    fix zoom and switch back to more extreme near/far

commit 8185a96
Author: ffreyer <frederic481994@hotmail.de>
Date:   Mon Mar 13 01:09:17 2023 +0100

    update tests

commit d31d905
Author: ffreyer <frederic481994@hotmail.de>
Date:   Mon Mar 13 00:56:41 2023 +0100

    update docs

commit ae7f89a
Author: ffreyer <frederic481994@hotmail.de>
Date:   Mon Mar 13 00:34:04 2023 +0100

    fix docstring [skip ci]

commit 4de5fa3
Author: ffreyer <frederic481994@hotmail.de>
Date:   Mon Mar 13 00:15:11 2023 +0100

    switch back rotation order to avoid change in upvector

commit 11313dc
Author: ffreyer <frederic481994@hotmail.de>
Date:   Mon Mar 13 00:03:05 2023 +0100

    cleanup docstring

commit 3e07289
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Mar 12 23:37:22 2023 +0100

    update test values

commit b54c0ae
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Mar 12 20:00:54 2023 +0100

    remove enable translation/rotation/zoom

    can be achieved by removing hotkeys

commit 6cbca9e
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Mar 12 19:55:32 2023 +0100

    add example

commit e4b056a
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Mar 12 19:46:57 2023 +0100

    fix typo

commit 066f0b7
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Mar 12 19:23:35 2023 +0100

    switch back to translation zoom, cleanup/reorganize
SimonDanisch added a commit that referenced this pull request Aug 16, 2023
commit 12bcc1c
Merge: 01b1589 f3bb1c8
Author: Simon <sdanisch@protonmail.com>
Date:   Tue Aug 1 11:03:08 2023 +0200

    Merge branch 'master' into ff/camera

commit 01b1589
Merge: 98c1096 07496e9
Author: ffreyer <frederic481994@hotmail.de>
Date:   Wed Jul 12 18:07:07 2023 +0200

    Merge branch 'master' into ff/camera

commit 98c1096
Author: ffreyer <frederic481994@hotmail.de>
Date:   Tue Jul 4 21:26:00 2023 +0200

    fix test errors

commit 34e9072
Merge: 001542e eaf1028
Author: Frederic Freyer <frederic481994@hotmail.de>
Date:   Tue Jul 4 18:46:07 2023 +0200

    Merge branch 'master' into ff/camera

commit 001542e
Author: ffreyer <frederic481994@hotmail.de>
Date:   Tue Jul 4 18:25:09 2023 +0200

    avoid centering on unrelated plots

commit d89aac0
Author: ffreyer <frederic481994@hotmail.de>
Date:   Tue Jul 4 18:24:22 2023 +0200

    Merge branch 'master' into ff/camera

commit 381eb82
Merge: a26e6a1 8ccb6bd
Author: Frederic Freyer <frederic481994@hotmail.de>
Date:   Thu Jun 22 14:31:02 2023 +0200

    Merge branch 'master' into ff/camera

commit a26e6a1
Author: ffreyer <frederic481994@hotmail.de>
Date:   Mon Jun 12 13:45:21 2023 +0200

    check other ray_at_cursor methods

commit fc4fcd5
Author: ffreyer <frederic481994@hotmail.de>
Date:   Mon Jun 12 13:45:01 2023 +0200

    fix type error in cam2d!

commit fd9a04d
Merge: 64f7730 5f96457
Author: ffreyer <frederic481994@hotmail.de>
Date:   Mon Jun 12 13:19:06 2023 +0200

    Merge branch 'master' into ff/camera

commit 64f7730
Author: ffreyer <frederic481994@hotmail.de>
Date:   Fri May 5 15:32:02 2023 +0200

    consider transforms when centering on plot object

commit 6972303
Merge: 10aff36 13e1d84
Author: Simon <sdanisch@protonmail.com>
Date:   Tue Apr 25 16:03:43 2023 +0200

    Merge branch 'master' into ff/camera

commit 10aff36
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Apr 23 21:10:30 2023 +0200

    update docs

commit 1053b3a
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Apr 23 18:47:33 2023 +0200

    update NEWS

commit 6945b97
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Apr 23 18:23:42 2023 +0200

    fix line indicator in band

commit fdc3666
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Apr 23 13:27:07 2023 +0200

    fix wrong tooltip in volumeslices

commit d51ed11
Author: ffreyer <frederic481994@hotmail.de>
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 <frederic481994@hotmail.de>
Date:   Sat Apr 22 00:54:00 2023 +0200

    add on-click refocus of camera

commit 78ee1e5
Author: ffreyer <frederic481994@hotmail.de>
Date:   Wed Apr 19 21:52:04 2023 +0200

    improve default controls/hotkeys

commit a72abbd
Merge: 43e6428 bc13edb
Author: Simon <sdanisch@protonmail.com>
Date:   Wed Apr 19 14:30:27 2023 +0200

    Merge branch 'master' into ff/camera

commit 43e6428
Author: ffreyer <frederic481994@hotmail.de>
Date:   Tue Mar 28 17:21:09 2023 +0200

    cleanup news

commit ed48aa6
Merge: 6594406 cdad6dd
Author: ffreyer <frederic481994@hotmail.de>
Date:   Tue Mar 28 17:20:34 2023 +0200

    Merge branch 'master' into ff/camera

commit 6594406
Author: ffreyer <frederic481994@hotmail.de>
Date:   Tue Mar 28 17:20:28 2023 +0200

    fix whitespace?

commit 87e7254
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Mar 19 16:28:45 2023 +0100

    deprecate old_cam [skip ci]

commit f264360
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Mar 19 16:04:24 2023 +0100

    bring back fov controls

commit becc8cd
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Mar 19 15:49:28 2023 +0100

    add center in orbital update_cam!

commit d6639fc
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Mar 19 15:28:48 2023 +0100

    bring back perspective zoom_shift_lookat

commit c890d34
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Mar 19 15:09:00 2023 +0100

    update NEWS

commit 4fee98b
Merge: 5274295 4bebd86
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Mar 19 15:00:39 2023 +0100

    Merge branch 'master' into ff/camera

commit 5274295
Author: ffreyer <frederic481994@hotmail.de>
Date:   Thu Mar 16 18:46:30 2023 +0100

    Add update_cam! with angles

commit 6786f96
Author: ffreyer <frederic481994@hotmail.de>
Date:   Wed Mar 15 17:53:18 2023 +0100

    tweak default zoom some more

commit 3c22c47
Author: ffreyer <frederic481994@hotmail.de>
Date:   Wed Mar 15 15:41:27 2023 +0100

    fix zoom and switch back to more extreme near/far

commit 8185a96
Author: ffreyer <frederic481994@hotmail.de>
Date:   Mon Mar 13 01:09:17 2023 +0100

    update tests

commit d31d905
Author: ffreyer <frederic481994@hotmail.de>
Date:   Mon Mar 13 00:56:41 2023 +0100

    update docs

commit ae7f89a
Author: ffreyer <frederic481994@hotmail.de>
Date:   Mon Mar 13 00:34:04 2023 +0100

    fix docstring [skip ci]

commit 4de5fa3
Author: ffreyer <frederic481994@hotmail.de>
Date:   Mon Mar 13 00:15:11 2023 +0100

    switch back rotation order to avoid change in upvector

commit 11313dc
Author: ffreyer <frederic481994@hotmail.de>
Date:   Mon Mar 13 00:03:05 2023 +0100

    cleanup docstring

commit 3e07289
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Mar 12 23:37:22 2023 +0100

    update test values

commit b54c0ae
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Mar 12 20:00:54 2023 +0100

    remove enable translation/rotation/zoom

    can be achieved by removing hotkeys

commit 6cbca9e
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Mar 12 19:55:32 2023 +0100

    add example

commit e4b056a
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Mar 12 19:46:57 2023 +0100

    fix typo

commit 066f0b7
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Mar 12 19:23:35 2023 +0100

    switch back to translation zoom, cleanup/reorganize
SimonDanisch added a commit that referenced this pull request Aug 16, 2023
commit 12bcc1c
Merge: 01b1589 f3bb1c8
Author: Simon <sdanisch@protonmail.com>
Date:   Tue Aug 1 11:03:08 2023 +0200

    Merge branch 'master' into ff/camera

commit 01b1589
Merge: 98c1096 07496e9
Author: ffreyer <frederic481994@hotmail.de>
Date:   Wed Jul 12 18:07:07 2023 +0200

    Merge branch 'master' into ff/camera

commit 98c1096
Author: ffreyer <frederic481994@hotmail.de>
Date:   Tue Jul 4 21:26:00 2023 +0200

    fix test errors

commit 34e9072
Merge: 001542e eaf1028
Author: Frederic Freyer <frederic481994@hotmail.de>
Date:   Tue Jul 4 18:46:07 2023 +0200

    Merge branch 'master' into ff/camera

commit 001542e
Author: ffreyer <frederic481994@hotmail.de>
Date:   Tue Jul 4 18:25:09 2023 +0200

    avoid centering on unrelated plots

commit d89aac0
Author: ffreyer <frederic481994@hotmail.de>
Date:   Tue Jul 4 18:24:22 2023 +0200

    Merge branch 'master' into ff/camera

commit 381eb82
Merge: a26e6a1 8ccb6bd
Author: Frederic Freyer <frederic481994@hotmail.de>
Date:   Thu Jun 22 14:31:02 2023 +0200

    Merge branch 'master' into ff/camera

commit a26e6a1
Author: ffreyer <frederic481994@hotmail.de>
Date:   Mon Jun 12 13:45:21 2023 +0200

    check other ray_at_cursor methods

commit fc4fcd5
Author: ffreyer <frederic481994@hotmail.de>
Date:   Mon Jun 12 13:45:01 2023 +0200

    fix type error in cam2d!

commit fd9a04d
Merge: 64f7730 5f96457
Author: ffreyer <frederic481994@hotmail.de>
Date:   Mon Jun 12 13:19:06 2023 +0200

    Merge branch 'master' into ff/camera

commit 64f7730
Author: ffreyer <frederic481994@hotmail.de>
Date:   Fri May 5 15:32:02 2023 +0200

    consider transforms when centering on plot object

commit 6972303
Merge: 10aff36 13e1d84
Author: Simon <sdanisch@protonmail.com>
Date:   Tue Apr 25 16:03:43 2023 +0200

    Merge branch 'master' into ff/camera

commit 10aff36
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Apr 23 21:10:30 2023 +0200

    update docs

commit 1053b3a
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Apr 23 18:47:33 2023 +0200

    update NEWS

commit 6945b97
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Apr 23 18:23:42 2023 +0200

    fix line indicator in band

commit fdc3666
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Apr 23 13:27:07 2023 +0200

    fix wrong tooltip in volumeslices

commit d51ed11
Author: ffreyer <frederic481994@hotmail.de>
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 <frederic481994@hotmail.de>
Date:   Sat Apr 22 00:54:00 2023 +0200

    add on-click refocus of camera

commit 78ee1e5
Author: ffreyer <frederic481994@hotmail.de>
Date:   Wed Apr 19 21:52:04 2023 +0200

    improve default controls/hotkeys

commit a72abbd
Merge: 43e6428 bc13edb
Author: Simon <sdanisch@protonmail.com>
Date:   Wed Apr 19 14:30:27 2023 +0200

    Merge branch 'master' into ff/camera

commit 43e6428
Author: ffreyer <frederic481994@hotmail.de>
Date:   Tue Mar 28 17:21:09 2023 +0200

    cleanup news

commit ed48aa6
Merge: 6594406 cdad6dd
Author: ffreyer <frederic481994@hotmail.de>
Date:   Tue Mar 28 17:20:34 2023 +0200

    Merge branch 'master' into ff/camera

commit 6594406
Author: ffreyer <frederic481994@hotmail.de>
Date:   Tue Mar 28 17:20:28 2023 +0200

    fix whitespace?

commit 87e7254
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Mar 19 16:28:45 2023 +0100

    deprecate old_cam [skip ci]

commit f264360
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Mar 19 16:04:24 2023 +0100

    bring back fov controls

commit becc8cd
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Mar 19 15:49:28 2023 +0100

    add center in orbital update_cam!

commit d6639fc
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Mar 19 15:28:48 2023 +0100

    bring back perspective zoom_shift_lookat

commit c890d34
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Mar 19 15:09:00 2023 +0100

    update NEWS

commit 4fee98b
Merge: 5274295 4bebd86
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Mar 19 15:00:39 2023 +0100

    Merge branch 'master' into ff/camera

commit 5274295
Author: ffreyer <frederic481994@hotmail.de>
Date:   Thu Mar 16 18:46:30 2023 +0100

    Add update_cam! with angles

commit 6786f96
Author: ffreyer <frederic481994@hotmail.de>
Date:   Wed Mar 15 17:53:18 2023 +0100

    tweak default zoom some more

commit 3c22c47
Author: ffreyer <frederic481994@hotmail.de>
Date:   Wed Mar 15 15:41:27 2023 +0100

    fix zoom and switch back to more extreme near/far

commit 8185a96
Author: ffreyer <frederic481994@hotmail.de>
Date:   Mon Mar 13 01:09:17 2023 +0100

    update tests

commit d31d905
Author: ffreyer <frederic481994@hotmail.de>
Date:   Mon Mar 13 00:56:41 2023 +0100

    update docs

commit ae7f89a
Author: ffreyer <frederic481994@hotmail.de>
Date:   Mon Mar 13 00:34:04 2023 +0100

    fix docstring [skip ci]

commit 4de5fa3
Author: ffreyer <frederic481994@hotmail.de>
Date:   Mon Mar 13 00:15:11 2023 +0100

    switch back rotation order to avoid change in upvector

commit 11313dc
Author: ffreyer <frederic481994@hotmail.de>
Date:   Mon Mar 13 00:03:05 2023 +0100

    cleanup docstring

commit 3e07289
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Mar 12 23:37:22 2023 +0100

    update test values

commit b54c0ae
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Mar 12 20:00:54 2023 +0100

    remove enable translation/rotation/zoom

    can be achieved by removing hotkeys

commit 6cbca9e
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Mar 12 19:55:32 2023 +0100

    add example

commit e4b056a
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Mar 12 19:46:57 2023 +0100

    fix typo

commit 066f0b7
Author: ffreyer <frederic481994@hotmail.de>
Date:   Sun Mar 12 19:23:35 2023 +0100

    switch back to translation zoom, cleanup/reorganize
@ffreyer
Copy link
Collaborator Author

ffreyer commented Aug 29, 2023

I'm closing this since it's part of the beta branch now

@ffreyer ffreyer closed this Aug 29, 2023
SimonDanisch added a commit that referenced this pull request Nov 17, 2023
Continues #2831 !
Still needs to check, if I rebased correctly and didn't incorrectly
apply some of the changes!

## Merged PRs
- #2598
- #2746
- #2346
- #2544
- #3082
- #2868
- #3062
- #3106
- #3281
- #3246

## TODOS

- [x] fix flaky test `@test GLMakie.window_size(screen.glscreen) ==
scaled(screen, (W, H))`
- [x] Merge axis type inferences from #2220 
- [x] Test on different resolution screens, IJulia, Pluto, VSCode,
Windowed
- [x] rebase to only have merge commits from the PRs 
- [x] investigate unexpected speed ups
- [x] reset camera settings from tests
- [ ] check doc image generation
- [x] rethink default near/far in Camera3D (compatability with OIT)
- [x] merge #3246
- [x] fix WGLMakie issues/tests:
- [x] fix line depth issues (see tests: ~~hexbin colorrange~~ (not new),
LaTeXStrings in Axis3, Axis3 axis reversal)
  - [x] fix lighting of surface with nan points (fixed in #3246)
- ~~volume/3D contour artifacts (see 3D Contour with 2D contour
slices)~~ not new
  - ~~artifacting in "colorscale (lines)"~~ not new
- [x] GLMakie:
  - [x] slight outline in "scatter image markers" test
  - ~~clipping/z-fighting in "volume translated"~~ not new
- [x] 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
- [x] Check "SpecApi in convert_arguments" (colors swapped?)


## Fixes the following errors

- fixes #2721 via #2746
- fixes #1600 via #2746
- fixes #1236 via #2746
- fixes MakieOrg/GeoMakie.jl#133 via #2598
- closes #2522
- closes #3239 via #3246
- fixes #3238 via #3246
- fixes #2985 via #3246
- fixes #3307 via #3281
@ffreyer ffreyer deleted the ff/camera branch November 30, 2023 12:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

callback error in arrows data inspection Fixed-axis camera rotation Y and Z axes swapped
4 participants