diff options
Diffstat (limited to 'servers/visual/visual_server_viewport.h')
| -rw-r--r-- | servers/visual/visual_server_viewport.h | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/servers/visual/visual_server_viewport.h b/servers/visual/visual_server_viewport.h index e8d36f70af..30b53f3935 100644 --- a/servers/visual/visual_server_viewport.h +++ b/servers/visual/visual_server_viewport.h @@ -31,6 +31,7 @@ #ifndef VISUALSERVERVIEWPORT_H #define VISUALSERVERVIEWPORT_H +#include "core/rid_owner.h" #include "core/self_list.h" #include "rasterizer.h" #include "servers/arvr/arvr_interface.h" @@ -38,10 +39,10 @@ class VisualServerViewport { public: - struct CanvasBase : public RID_Data { + struct CanvasBase { }; - struct Viewport : public RID_Data { + struct Viewport { RID self; RID parent; @@ -55,6 +56,9 @@ public: VS::ViewportUpdateMode update_mode; RID render_target; RID render_target_texture; + RID render_buffers; + + VS::ViewportMSAA msaa; int viewport_to_screen; Rect2 viewport_to_screen_rect; @@ -63,7 +67,6 @@ public: bool hide_scenario; bool hide_canvas; bool disable_environment; - bool disable_3d; bool disable_3d_by_usage; bool keep_3d_linear; @@ -116,10 +119,9 @@ public: disable_environment = false; viewport_to_screen = 0; shadow_atlas_size = 0; - disable_3d = false; - disable_3d_by_usage = false; keep_3d_linear = false; debug_draw = VS::VIEWPORT_DEBUG_DRAW_DISABLED; + msaa = VS::VIEWPORT_MSAA_DISABLED; for (int i = 0; i < VS::VIEWPORT_RENDER_INFO_MAX; i++) { render_info[i] = 0; } @@ -127,7 +129,7 @@ public: } }; - mutable RID_Owner<Viewport> viewport_owner; + mutable RID_PtrOwner<Viewport> viewport_owner; struct ViewportSort { _FORCE_INLINE_ bool operator()(const Viewport *p_left, const Viewport *p_right) const { @@ -146,7 +148,6 @@ public: Vector<Viewport *> active_viewports; private: - Color clear_color; void _draw_3d(Viewport *p_viewport, ARVRInterface::Eyes p_eye); void _draw_viewport(Viewport *p_viewport, ARVRInterface::Eyes p_eye = ARVRInterface::EYE_MONO); @@ -173,8 +174,6 @@ public: void viewport_set_hide_scenario(RID p_viewport, bool p_hide); void viewport_set_hide_canvas(RID p_viewport, bool p_hide); void viewport_set_disable_environment(RID p_viewport, bool p_disable); - void viewport_set_disable_3d(RID p_viewport, bool p_disable); - void viewport_set_keep_3d_linear(RID p_viewport, bool p_keep_3d_linear); void viewport_attach_camera(RID p_viewport, RID p_camera); void viewport_set_scenario(RID p_viewport, RID p_scenario); @@ -190,8 +189,6 @@ public: void viewport_set_shadow_atlas_quadrant_subdivision(RID p_viewport, int p_quadrant, int p_subdiv); void viewport_set_msaa(RID p_viewport, VS::ViewportMSAA p_msaa); - void viewport_set_hdr(RID p_viewport, bool p_enabled); - void viewport_set_usage(RID p_viewport, VS::ViewportUsage p_usage); virtual int viewport_get_render_info(RID p_viewport, VS::ViewportRenderInfo p_info); virtual void viewport_set_debug_draw(RID p_viewport, VS::ViewportDebugDraw p_draw); |