diff options
| author | Clay John <claynjohn@gmail.com> | 2022-09-15 18:19:24 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-15 18:19:24 -0700 |
| commit | 95df3e7c88f4c044a46b45239a3d447a71f05446 (patch) | |
| tree | 4f7b6724afff6fa21d1a8c09b3cf180e7e7c207f /servers/rendering/renderer_viewport.h | |
| parent | c2babb65580d4dce3a0fc8834dd05fe177227b6e (diff) | |
| parent | e82cd46a746053217d749ea39b4a52f040aaf1e3 (diff) | |
Merge pull request #65800 from dsnopek/xr-resize-viewport-3
Fix XR rendering in 'opengl3' driver and expose true size via the Viewport node
Diffstat (limited to 'servers/rendering/renderer_viewport.h')
| -rw-r--r-- | servers/rendering/renderer_viewport.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/servers/rendering/renderer_viewport.h b/servers/rendering/renderer_viewport.h index a123c70372..08ba6abc74 100644 --- a/servers/rendering/renderer_viewport.h +++ b/servers/rendering/renderer_viewport.h @@ -54,6 +54,7 @@ public: Size2i internal_size; Size2i size; + uint32_t view_count; RID camera; RID scenario; @@ -150,6 +151,7 @@ public: RendererScene::RenderInfo render_info; Viewport() { + view_count = 1; update_mode = RS::VIEWPORT_UPDATE_WHEN_VISIBLE; clear_mode = RS::VIEWPORT_CLEAR_ALWAYS; transparent_bg = false; @@ -176,8 +178,6 @@ public: time_gpu_begin = 0; time_gpu_end = 0; } - - uint32_t get_view_count(); }; HashMap<String, RID> timestamp_vp_map; @@ -196,6 +196,7 @@ public: private: Vector<Viewport *> _sort_active_viewports(); + void _viewport_set_size(Viewport *p_viewport, int p_width, int p_height, uint32_t p_view_count); void _configure_3d_render_buffers(Viewport *p_viewport); void _draw_3d(Viewport *p_viewport); void _draw_viewport(Viewport *p_viewport); |