Commit graph

7136 commits

Author SHA1 Message Date
Rylie Pavlik e68339e331 st/oxr: Fix typo
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2242>
2024-06-07 16:50:30 -05:00
Rylie Pavlik d44c49dd1b doc: Cleanup changelog
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2242>
2024-06-07 16:50:30 -05:00
Rylie Pavlik f971b5ca68 doc: Update release instructions
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2242>
2024-06-07 16:50:29 -05:00
Rylie Pavlik 1874683137 scripts: Do not correct the spelling of 'marge', etc
These are not spelling errors.

Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2242>
2024-06-07 16:33:45 -05:00
Rylie Pavlik de9b9f79ea gradle: Use our own groovy code to compute a version from git
git worktree is not supported by androidgitversion

This makes it work with git worktrees and submodules, unlike the
plugin we used before. Unlike some other gradle plugins,
this allows us to set our own filter for tags that get included in
the version.

Thanks to Tao Pei for noticing the problem and proposing an initial fix.

Co-authored-by: tao.pei <tao.pei@xjmz.com>
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2204>
2024-06-07 15:22:47 -05:00
Rylie Pavlik 44552a1722 doc/changes: Clean up changelog fragments
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2241>
2024-06-07 14:26:06 +00:00
Rylie Pavlik 19593da045 misc: Update clang-tidy config.
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2241>
2024-06-07 14:26:06 +00:00
Rylie Pavlik 5a64069d42 st/oxr: Remove TODO mentioning non-existent path.
Removed from an early 1.0 version as not implementable errata.

Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2241>
2024-06-07 14:26:06 +00:00
Christoph Haag 41593ef09d doc: Document !2239
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2239>
2024-06-07 14:13:44 +00:00
Christoph Haag 6d71c083ea m/space: Restore upgrading of 3dof relations with valid positions
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2239>
2024-06-07 14:13:44 +00:00
Rylie Pavlik 9da09d4de6 c/shaders: One file of restored credit missed earlier.
This is what I get for not making sure I save before staging/committing.

d0617c04d5 accidentally removed credit.

Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2240>
2024-06-06 21:32:04 -05:00
Rylie Pavlik 53bcd6ebed a/vk: Comments
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2238>
2024-06-06 15:10:22 +00:00
Rylie Pavlik 7ce4e8f66c c/main: Fix typos
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2238>
2024-06-06 15:10:22 +00:00
Rylie Pavlik 9f707c3536 comp: Fix doc warnings
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2237>
2024-06-06 14:54:03 +00:00
Rylie Pavlik b17fbfc4ba ipc: Fix doc warnings
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2237>
2024-06-06 14:54:03 +00:00
Rylie Pavlik bc916e0f36 xrt: Fix documentation warnings
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2237>
2024-06-06 14:54:03 +00:00
Rylie Pavlik 23115015fc c/shaders: Add back credit accidentally removed during shader overhaul
The updated versions of these shaders was added before
the originals were removed, so rename detection didn't trigger,
and d0617c04d5 accidentally
removed credit.

Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2236>
2024-06-06 09:38:11 -05:00
Hui Xu cdb9c38ee0 external/jnipp: Check and re-assign JNIEnv
Fixes a crash when resumed from launcher.

Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2226>
2024-06-06 01:46:01 +00:00
Rylie Pavlik 5b8edfbb30 c/main: Default to compute compositor on Android to work around issue #381
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2235>
2024-06-05 16:10:02 -05:00
Rylie Pavlik fc830bc5b4 a/util: Prepend "monado" to function name on android logcat
For easier searching.

Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2232>
2024-06-05 19:55:58 +00:00
Simon Zeni d2c4126ba6 doc: fix doxygen extra stylesheet issues
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2230>
2024-06-05 19:43:17 +00:00
Alicja Michalska 69907679fc d/wmr: Add definitions for Acer AH101 HMD
This patch adds VID/PID for Acer AH101 (WMR) headset.

Signed-off-by: Alicja Michalska <ahplka19@gmail.com>
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2222>
2024-06-05 18:57:11 +00:00
Simon Zeni df5c052833 CI: fix reprepro step on main from forks
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2234>
2024-06-05 18:46:23 +00:00
Mario Kleiner 335960d1ad doc: Document !2228
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2228>
2024-06-04 19:54:02 +00:00
Mario Kleiner be55dec119 d/twrap: Correct axis assignments for poses provided by basalt slam.
Testing with a Luxonis Oak-D Pro with basalt slam tracking on a simulated
Northstar suggests the returned axis from basalt vit are wrong wrt. to
the OpenXR reference frame.

Invert assigned y and z axis, similar to what is done for poses returned
by basalt slam for other HMD drivers, e.g., the drivers for Rift-S, Valve
Index / Vive, WMR and Realsense, in various *_correct_pose_from_basalt()
functions.

While we are at it, also make sure the dx->pre_rotate enable flag and
debug UI checkbox actually has an effect on operation.

Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2228>
2024-06-04 19:54:02 +00:00
Mario Kleiner 09273292c2 d/dai: Swap x and -y axis to account for orientation of IMU in the camera.
We need a different axis assignment before submitting samples from the
DepthAI driven Luxonis Oak cameras IMU to the imu sinks, to account for
the orientation of the IMU in those cameras. On those cameras, the IMU
y axis points to the right, the x axis points downwards, the z axis
backwards. See following official Luxonis answer for reference:

https://discuss.luxonis.com/d/1044-about-oak-d-pro-w-imu-coordinate-system/8

One way to confirm the current wrong assignment and this fix is to select
"Use 3DOF tracking instead of SLAM" checkbox in the "Generic inside out
head tracker" debug UI.

Tested with a Luxonis Oak-D Pro camera.

Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2228>
2024-06-04 19:54:02 +00:00
Mario Kleiner e7cbcefac6 t/north_star: Add slam device after HMD device.
The HMD display device apparently needs to be the first one in
the xdevs list. Comments in xrt_prober.h seem to confirm this.

Order hmd and slam device acccordingly in the north_star target
builder.

Otherwise XR client calls to xrEndFrame(), at least with projection
layers, will cause monado-service to crash, as it chooses the
"slam device" xdev as "HMD", instead of the actual hmd device,
and therefore dereferences a xdev->hmd which is NULL inside
_update_projection_layer() and thereby segfaults.

gdb backtrace after SIGSEGV:

_update_projection_layer (xc=0x7ffe60000bf0, ics=0x5555560a5208, layer=0x7fff0a5ed620, i=0) at /home/dragon/projects/monado/src/xrt/ipc/server/ipc_server_handler.c:749
749		uint32_t view_count = xdev->hmd->view_count;
(gdb) bt
0  _update_projection_layer (xc=0x7ffe60000bf0, ics=0x5555560a5208, layer=0x7fff0a5ed620, i=0) at /home/dragon/projects/monado/src/xrt/ipc/server/ipc_server_handler.c:749
1  0x00005555555abd30 in _update_layers (ics=0x5555560a5208, xc=0x7ffe60000bf0, slot=0x7fff0a5ed600) at /home/dragon/projects/monado/src/xrt/ipc/server/ipc_server_handler.c:973
2  0x00005555555ac060 in ipc_handle_compositor_layer_sync (ics=0x5555560a5208, slot_id=0, out_free_slot_id=0x7fff0a5ef134, handles=0x7fff0a5ef170, handle_count=0)
   at /home/dragon/projects/monado/src/xrt/ipc/server/ipc_server_handler.c:1058
3  0x00005555555a7167 in ipc_dispatch (ics=0x5555560a5208, ipc_command=0x7fff0a5ef840) at /home/dragon/projects/monado/build/src/xrt/ipc/ipc_server_generated.c:518
4  0x00005555555a56cc in client_loop (ics=0x5555560a5208) at /home/dragon/projects/monado/src/xrt/ipc/server/ipc_server_per_client_thread.c:191
5  0x00005555555a593d in ipc_server_client_thread (_ics=0x5555560a5208) at /home/dragon/projects/monado/src/xrt/ipc/server/ipc_server_per_client_thread.c:332

Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2228>
2024-06-04 19:54:02 +00:00
Christoph Haag b681a01f7f doc: Document !2225 2024-06-01 01:41:21 +02:00
Christoph Haag ccfac98d36 st/oxr: Ignore primaryViewConfigurationType in headless
Spec:
"In a headless session, the XrSessionBeginInfo::primaryViewConfigurationType must be ignored and may be 0."
2024-06-01 01:39:59 +02:00
Rylie Pavlik 5980804535 c/util: Comments
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2220>
2024-05-31 16:52:38 +00:00
Rylie Pavlik 569419de07 c/render: Internal comments
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2220>
2024-05-31 16:52:38 +00:00
Rylie Pavlik a07bfba370 c/main: Internal comments
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2220>
2024-05-31 16:52:38 +00:00
Rylie Pavlik 342fab6b02 c/util: comp_scratch doc improvements
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2220>
2024-05-31 16:52:38 +00:00
Korcan Hussein 1e047b5b6d gradle,ci: Sign CI APKs for Android release builds
Co-authored-by: Rylie Pavlik <rylie.pavlik@collabora.com>
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2209>
2024-05-30 17:25:23 -05:00
Korcan Hussein 68beca75d4 doc: Document !2210
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2210>
2024-05-30 20:30:25 +00:00
Korcan Hussein 2639d830b6 st/oxr: Fixes crash bug in xrGetVisibilityMaskKHR for in-process builds
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2210>
2024-05-30 20:30:25 +00:00
Jan Schmidt 6cd8181b22 Changelog for !2227
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2227>
2024-05-30 19:51:13 +03:00
Jan Schmidt b66ccfb258 build: Rift S doesn't actually depend on hidapi.
Remove the dep from the Rift S driver checks

Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2227>
2024-05-30 19:41:12 +03:00
Christoph Haag 5c70702c9b doc: Document !2194
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2194>
2024-05-28 22:09:13 +00:00
Christoph Haag 8dd24bf28a xrt: Move OpenXR defines to header
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2194>
2024-05-28 22:09:13 +00:00
Christoph Haag 8b2571b6ac st/oxr: Check for compile definitions after includes
If the defines are set in a header instead of with the compiler, they need
to be checked after includes.

Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2194>
2024-05-28 22:09:13 +00:00
Christoph Haag 8f30fd137a scripts: Run generate_iwyu_mapping.py
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2194>
2024-05-28 22:09:13 +00:00
Christoph Haag cddf578092 st/oxr: Simplify path_cache pointers
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2194>
2024-05-28 22:09:13 +00:00
Christoph Haag 13b5792a30 d/remote: Add palm pose
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2194>
2024-05-28 22:09:13 +00:00
Christoph Haag d8a151ced9 d/remote: Default to stereo
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2194>
2024-05-28 22:09:13 +00:00
Christoph Haag 0d11937ae2 a/bindings: Mark grip_surface as available in KHR_maintenance1
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2194>
2024-05-28 22:09:13 +00:00
Christoph Haag bb2008ebf2 st/oxr: Add KHR_maintenance1
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2194>
2024-05-28 22:09:13 +00:00
Christoph Haag 2371d68bbe a/bindings: Add meta/touch_controller_* profiles
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2194>
2024-05-28 22:09:13 +00:00
Christoph Haag b101db3705 a/bindings,xrt: Add Touch Plus controller
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2194>
2024-05-28 22:09:13 +00:00
Christoph Haag 73686b340b a/bindings,xrt: Add touch pro controller
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2194>
2024-05-28 22:09:13 +00:00