diff options
| author | Peter Kim <pk15950@gmail.com> | 2022-04-30 10:23:43 +0300 |
|---|---|---|
| committer | Peter Kim <pk15950@gmail.com> | 2022-04-30 10:23:43 +0300 |
| commit | 5c92c04518b5dc7c57c3b3a9e81b45879af2e080 (patch) | |
| tree | 7c4f0dee8132ae57fc896989f8e7d5839460c9d1 /source/blender/windowmanager/xr | |
| parent | 2fc6563a597ad8877fea5e580c87eb4e13e58961 (diff) | |
XR: Add object extras, object types visibility session options
This allows object extras such as image-empties to be shown in the VR
viewport/headset display. Being able to see reference images in VR can
be useful for architectural walkthroughs and 3D modeling applications.
Since users may not want to see all object extras (lights, cameras,
etc.), per-object-type visibility settings are also added as session
options.
By slightly refactoring the definition of the 3D View object types
visibility panel (note: no functional changes), the VR Scene Inspection
add-on can show a similar panel without duplicating code. When VR
selection is possible in the future, the object type select options can
also be enabled.
Reviewed By: Severin
Differential Revision: https://developer.blender.org/D14220
Diffstat (limited to 'source/blender/windowmanager/xr')
| -rw-r--r-- | source/blender/windowmanager/xr/intern/wm_xr_draw.c | 2 | ||||
| -rw-r--r-- | source/blender/windowmanager/xr/intern/wm_xr_session.c | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/windowmanager/xr/intern/wm_xr_draw.c b/source/blender/windowmanager/xr/intern/wm_xr_draw.c index 303ecca17f0..3b1acee2b99 100644 --- a/source/blender/windowmanager/xr/intern/wm_xr_draw.c +++ b/source/blender/windowmanager/xr/intern/wm_xr_draw.c @@ -160,6 +160,8 @@ void wm_xr_draw_view(const GHOST_XrDrawViewInfo *draw_view, void *customdata) draw_data->scene, &settings->shading, (eDrawType)settings->shading.type, + settings->object_type_exclude_viewport, + settings->object_type_exclude_select, draw_view->width, draw_view->height, display_flags, diff --git a/source/blender/windowmanager/xr/intern/wm_xr_session.c b/source/blender/windowmanager/xr/intern/wm_xr_session.c index f1ccaadc1e4..0a76fd0a25f 100644 --- a/source/blender/windowmanager/xr/intern/wm_xr_session.c +++ b/source/blender/windowmanager/xr/intern/wm_xr_session.c @@ -1212,6 +1212,11 @@ void wm_xr_session_actions_update(wmWindowManager *wm) xr->runtime->area = ED_area_offscreen_create(win, SPACE_VIEW3D); } + /* Set XR area object type flags for operators. */ + View3D *v3d = xr->runtime->area->spacedata.first; + v3d->object_type_exclude_viewport = settings->object_type_exclude_viewport; + v3d->object_type_exclude_select = settings->object_type_exclude_select; + wm_xr_session_events_dispatch(xr, xr_context, active_action_set, state, win); } } |