From 6837f0863975e846150af398e9f8332c818c59a3 Mon Sep 17 00:00:00 2001 From: Ivan Gagis Date: Thu, 19 Nov 2026 04:45:43 +0200 Subject: [PATCH 01/11] render: extract object creation into a new ruis::render::factory Implement issue #190 (render context redesign). Object creation (make_shaders, make_texture_*, make_vertex_buffer, make_index_buffer, make_vertex_array) is split out of ruis::render::context into a new ruis::render::factory class. The factory is the shared (headless) render context and owns the make_* functions; every per-window context holds an injected shared_ref and no longer creates shareable objects. Every GPU object (texture_2d, texture_depth, texture_stencil, texture_cube, vertex_buffer, index_buffer, vertex_array and the four shader base classes) now stores a shared_ref instead of a shared_ref, so an object created for one window is safely usable in any other window (it is bound to the shared context, not a single window). make_framebuffer stays on the context: a frame buffer is inherently per-window. The resource_loader and renderer::objects now take the factory, and the ~42 make_* call sites in the ruis core are routed through it. This makes the 'create shared objects via the shared context' rule enforced by the type system: a per-window context no longer exposes the shareable make_* at all. --- src/ruis/font/texture_font.cpp | 2 +- src/ruis/font/texture_font.hxx | 4 +- src/ruis/font/texture_font_face.cpp | 2 +- src/ruis/font/texture_font_face.hxx | 4 +- src/ruis/paint/ellipse_vao.cpp | 6 +- src/ruis/paint/ellipse_vao.hpp | 10 +- src/ruis/paint/path_vao.cpp | 12 +- src/ruis/paint/rectangle_vao.cpp | 14 +- src/ruis/paint/rectangle_vao.hpp | 10 +- src/ruis/render/context.cpp | 2 + src/ruis/render/context.hpp | 81 ++------- src/ruis/render/factory.hpp | 161 ++++++++++++++++++ src/ruis/render/index_buffer.hpp | 6 +- src/ruis/render/native_window.hpp | 2 + src/ruis/render/renderer.cpp | 4 +- src/ruis/render/renderer.hpp | 8 +- src/ruis/render/shaders/coloring_shader.hpp | 6 +- .../shaders/coloring_texturing_shader.hpp | 6 +- src/ruis/render/shaders/shader.hpp | 6 +- src/ruis/render/shaders/texturing_shader.hpp | 6 +- src/ruis/render/texture_2d.hpp | 6 +- src/ruis/render/texture_cube.hpp | 6 +- src/ruis/render/texture_depth.hpp | 6 +- src/ruis/render/texture_stencil.hpp | 6 +- src/ruis/render/vertex_array.cpp | 2 +- src/ruis/render/vertex_array.hpp | 6 +- src/ruis/render/vertex_buffer.hpp | 6 +- src/ruis/res/font.cpp | 4 +- src/ruis/res/font.hpp | 2 +- src/ruis/res/gradient.cpp | 6 +- src/ruis/res/gradient.hpp | 4 +- src/ruis/res/image.cpp | 8 +- src/ruis/res/nine_patch.cpp | 6 +- src/ruis/res/nine_patch.hpp | 2 +- src/ruis/res/texture_2d.cpp | 4 +- src/ruis/res/texture_cube.cpp | 2 +- src/ruis/resource_loader.hpp | 6 +- src/ruis/widget/button/touch/tab_group.cpp | 2 +- src/ruis/widget/label/ellipse.cpp | 4 +- src/ruis/widget/label/rectangle.cpp | 4 +- src/ruis/widget/slider/touch/progress_bar.cpp | 2 +- src/ruis/widget/slider/touch/scroll_bar.cpp | 2 +- src/ruis/widget/widget.cpp | 4 +- tests/app1/src/cube_widget.cpp | 16 +- tests/book/src/cube_page.cpp | 16 +- tests/harness/util/dummy_context.cpp | 13 +- tests/paint/src/main.cpp | 8 +- tests/unit/src/style/style.cpp | 13 +- 48 files changed, 321 insertions(+), 197 deletions(-) create mode 100644 src/ruis/render/factory.hpp diff --git a/src/ruis/font/texture_font.cpp b/src/ruis/font/texture_font.cpp index 17ddd1845..94000e28e 100644 --- a/src/ruis/font/texture_font.cpp +++ b/src/ruis/font/texture_font.cpp @@ -201,7 +201,7 @@ texture_font::glyph texture_font::load_glyph(char32_t c) const } texture_font::texture_font( - utki::shared_ref rendering_context, // + utki::shared_ref rendering_context, // utki::shared_ref common_rendering_objects, utki::shared_ref face, unsigned font_size, diff --git a/src/ruis/font/texture_font.hxx b/src/ruis/font/texture_font.hxx index a145bda5e..9392035e4 100644 --- a/src/ruis/font/texture_font.hxx +++ b/src/ruis/font/texture_font.hxx @@ -104,7 +104,7 @@ public: */ class texture_font : public font { - const utki::shared_ref rendering_context; + const utki::shared_ref rendering_context; const utki::shared_ref common_rendering_objects; const unsigned font_size; @@ -143,7 +143,7 @@ public: * @param max_cached - maximum number of glyphs to cache. */ texture_font( - utki::shared_ref rendering_context, // + utki::shared_ref rendering_context, // utki::shared_ref common_rendering_objects, utki::shared_ref face, unsigned font_size, diff --git a/src/ruis/font/texture_font_face.cpp b/src/ruis/font/texture_font_face.cpp index 2a93524d0..2b18b4e0e 100644 --- a/src/ruis/font/texture_font_face.cpp +++ b/src/ruis/font/texture_font_face.cpp @@ -24,7 +24,7 @@ along with this program. If not, see . using namespace ruis; texture_font_face::texture_font_face( - utki::shared_ref rendering_context, // + utki::shared_ref rendering_context, // utki::shared_ref common_rendering_objects, utki::shared_ref face, unsigned max_cached diff --git a/src/ruis/font/texture_font_face.hxx b/src/ruis/font/texture_font_face.hxx index 327acb5e0..979ee8d39 100644 --- a/src/ruis/font/texture_font_face.hxx +++ b/src/ruis/font/texture_font_face.hxx @@ -28,7 +28,7 @@ namespace ruis { class texture_font_face : public font_face { - const utki::shared_ref rendering_context; + const utki::shared_ref rendering_context; const utki::shared_ref common_rendering_objects; const utki::shared_ref face; @@ -36,7 +36,7 @@ class texture_font_face : public font_face public: texture_font_face( - utki::shared_ref rendering_context, // + utki::shared_ref rendering_context, // utki::shared_ref common_rendering_objects, utki::shared_ref face, unsigned max_cached diff --git a/src/ruis/paint/ellipse_vao.cpp b/src/ruis/paint/ellipse_vao.cpp index 383c433d7..75b3f978c 100644 --- a/src/ruis/paint/ellipse_vao.cpp +++ b/src/ruis/paint/ellipse_vao.cpp @@ -32,11 +32,11 @@ std::map< ellipse_vao::cache; ellipse_vao::ellipse_vao( - utki::shared_ref ctx, + utki::shared_ref factory, vec2 diameters, // real stroke_width ) : - ctx(std::move(ctx)) + factory(std::move(factory)) { this->set( diameters, // @@ -117,7 +117,7 @@ void ellipse_vao::update_texture() // TODO: convert to greyscale image - this->tex = this->ctx.get().make_texture_2d( + this->tex = this->factory.get().make_texture_2d( make_ellipse_texture_image(this->diameters, this->stroke_width), // {} ); diff --git a/src/ruis/paint/ellipse_vao.hpp b/src/ruis/paint/ellipse_vao.hpp index 19773e1c0..c2366980d 100644 --- a/src/ruis/paint/ellipse_vao.hpp +++ b/src/ruis/paint/ellipse_vao.hpp @@ -32,9 +32,9 @@ namespace ruis::paint { */ class ellipse_vao { - // the context in which the ellipse texture is created; it must outlive this - // VAO, so use the shared resource-loader context - utki::shared_ref ctx; + // the render factory in which the ellipse texture is created; it must outlive + // this VAO, so use the shared resource-loader factory + utki::shared_ref factory; vec2 diameters = 0; @@ -44,12 +44,12 @@ class ellipse_vao public: /** * @brief Constructor. - * @param ctx - context to create the ellipse texture in (must outlive this VAO). + * @param factory - render factory to create the ellipse texture in (must outlive this VAO). * @param diameters - ellipse diameters. * @param stroke_width - ellipse border width. Non-positive value means filled ellipse. */ ellipse_vao( - utki::shared_ref ctx, + utki::shared_ref factory, vec2 diameters = 0, // real stroke_width = 0 // ); diff --git a/src/ruis/paint/path_vao.cpp b/src/ruis/paint/path_vao.cpp index 8164412ee..e95695156 100644 --- a/src/ruis/paint/path_vao.cpp +++ b/src/ruis/paint/path_vao.cpp @@ -32,21 +32,21 @@ path_vao::path_vao(utki::shared_ref r) : void path_vao::set(const path::vertices& path) { - auto core_buf = this->renderer.get().rendering_context.get().make_vertex_buffer(path.pos); + auto core_buf = this->renderer.get().rendering_context.get().factory.get().make_vertex_buffer(path.pos); - this->core = this->renderer.get().rendering_context.get().make_vertex_array( + this->core = this->renderer.get().rendering_context.get().factory.get().make_vertex_array( { core_buf, }, - this->renderer.get().rendering_context.get().make_index_buffer(path.in_indices), + this->renderer.get().rendering_context.get().factory.get().make_index_buffer(path.in_indices), ruis::render::vertex_array::mode::triangle_strip ); - this->border = this->renderer.get().rendering_context.get().make_vertex_array( + this->border = this->renderer.get().rendering_context.get().factory.get().make_vertex_array( { core_buf, - this->renderer.get().rendering_context.get().make_vertex_buffer(path.alpha), + this->renderer.get().rendering_context.get().factory.get().make_vertex_buffer(path.alpha), }, - this->renderer.get().rendering_context.get().make_index_buffer(path.out_indices), + this->renderer.get().rendering_context.get().factory.get().make_index_buffer(path.out_indices), ruis::render::vertex_array::mode::triangle_strip ); } diff --git a/src/ruis/paint/rectangle_vao.cpp b/src/ruis/paint/rectangle_vao.cpp index d4e33770e..b019aa2ae 100644 --- a/src/ruis/paint/rectangle_vao.cpp +++ b/src/ruis/paint/rectangle_vao.cpp @@ -36,11 +36,11 @@ std::map< rectangle_vao::cache; rectangle_vao::rectangle_vao( - utki::shared_ref ctx, // + utki::shared_ref factory, // utki::shared_ref objects, // parameters params ) : - ctx(std::move(ctx)), + factory(std::move(factory)), objects(std::move(objects)), params(params) { @@ -393,7 +393,7 @@ auto make_rounded_corners_texture_image(const rectangle_vao::parameters& params) } utki::shared_ref make_quad_vao( - const ruis::render::context& ctx, // + const ruis::render::factory& ctx, // const ruis::render::renderer::objects& objects, // const r4::segment2& tex_coords ) @@ -418,7 +418,7 @@ utki::shared_ref make_quad_vao( } std::array, 2>, 2> make_corner_vaos( - const ruis::render::context& ctx, // + const ruis::render::factory& ctx, // const ruis::render::renderer::objects& objects, // const ruis::vec2& tex_dims, const ruis::corners& radii @@ -471,7 +471,7 @@ std::array, 2>, 2> } // namespace rectangle_vao::rounded_corners_texture::rounded_corners_texture( - const ruis::render::context& ctx, // + const ruis::render::factory& ctx, // const ruis::render::renderer::objects& objects, // utki::shared_ref tex, corners radii @@ -507,10 +507,10 @@ void rectangle_vao::update_rounded_corners_texture() // TODO: convert to greyscale image - auto tex = this->ctx.get().make_texture_2d(std::move(raster_image), {}); + auto tex = this->factory.get().make_texture_2d(std::move(raster_image), {}); this->rounded_corners_tex = std::make_shared( - this->ctx.get(), // + this->factory.get(), // this->objects.get(), // std::move(tex), this->params.corner_radii // diff --git a/src/ruis/paint/rectangle_vao.hpp b/src/ruis/paint/rectangle_vao.hpp index 8a41ab066..ef66990cd 100644 --- a/src/ruis/paint/rectangle_vao.hpp +++ b/src/ruis/paint/rectangle_vao.hpp @@ -34,9 +34,9 @@ namespace ruis::paint { */ class rectangle_vao { - // the context in which the rounded-corners texture and corner VAOs are created; - // it must outlive this VAO, so use the shared resource-loader context - utki::shared_ref ctx; + // the render factory in which the rounded-corners texture and corner VAOs are + // created; it must outlive this VAO, so use the shared resource-loader factory + utki::shared_ref factory; // shared objects used to build the corner VAOs utki::shared_ref objects; @@ -85,7 +85,7 @@ class rectangle_vao * @param params - rectangle rendering parameters. */ rectangle_vao( - utki::shared_ref ctx, // + utki::shared_ref factory, // utki::shared_ref objects, // parameters params ); @@ -157,7 +157,7 @@ class rectangle_vao * @param radii - corner radii, in the same units as the texture's texels. */ rounded_corners_texture( - const ruis::render::context& ctx, // + const ruis::render::factory& factory, // const ruis::render::renderer::objects& objects, // utki::shared_ref tex, corners radii diff --git a/src/ruis/render/context.cpp b/src/ruis/render/context.cpp index 4f853ecd5..e93fa617f 100644 --- a/src/ruis/render/context.cpp +++ b/src/ruis/render/context.cpp @@ -27,9 +27,11 @@ std::vector ruis::render::context::cur_context_sta context::context( utki::shared_ref native_window, // + utki::shared_ref factory, // parameters params ) : native_window(std::move(native_window)), + factory(std::move(factory)), initial_matrix(std::move(params.initial_matrix)) { // insert this context to the bottom of the current contexts stack diff --git a/src/ruis/render/context.hpp b/src/ruis/render/context.hpp index a0c99b688..bcc981c92 100644 --- a/src/ruis/render/context.hpp +++ b/src/ruis/render/context.hpp @@ -26,15 +26,9 @@ along with this program. If not, see . #include #include -#include "shaders/coloring_shader.hpp" -#include "shaders/coloring_texturing_shader.hpp" -#include "shaders/shader.hpp" -#include "shaders/texturing_shader.hpp" - +#include "factory.hpp" #include "frame_buffer.hpp" #include "native_window.hpp" -#include "texture_cube.hpp" -#include "texture_depth.hpp" namespace ruis::render { class context : public std::enable_shared_from_this @@ -72,6 +66,15 @@ class context : public std::enable_shared_from_this const utki::shared_ref native_window; + /** + * @brief The render factory injected into this context. + * All shareable render objects (textures, buffers, vertex arrays, shaders) are + * created by the factory and hold a reference to it, so they can be used by any + * render context in the process. This context is only for state control and for + * creating per-window frame buffers. + */ + const utki::shared_ref factory; + struct parameters { r4::matrix4 initial_matrix; }; @@ -85,6 +88,7 @@ class context : public std::enable_shared_from_this context( utki::shared_ref, // + utki::shared_ref, // parameters params ); @@ -127,66 +131,9 @@ class context : public std::enable_shared_from_this // =============================== // ====== factory functions ====== - - struct shaders { - // TODO: make unique_ref - std::unique_ptr pos_tex; - std::unique_ptr color_pos; - std::unique_ptr color_pos_lum; - std::unique_ptr pos_clr; - std::unique_ptr color_pos_tex; - std::unique_ptr color_pos_tex_alpha; - }; - - virtual utki::shared_ref make_shaders() const = 0; - - struct texture_2d_parameters { - texture_2d::filter min_filter = texture_2d::filter::nearest; - texture_2d::filter mag_filter = texture_2d::filter::nearest; - texture_2d::mipmap mipmap = texture_2d::mipmap::none; - }; - - virtual utki::shared_ref make_texture_2d( - rasterimage::format format, - rasterimage::dimensioned::dimensions_type dims, - texture_2d_parameters params - ) const = 0; - - virtual utki::shared_ref make_texture_2d( - const rasterimage::image_variant& imvar, - texture_2d_parameters params - ) const = 0; - - virtual utki::shared_ref make_texture_2d( - rasterimage::image_variant&& imvar, - texture_2d_parameters params - ) const = 0; - - virtual utki::shared_ref make_texture_depth(rasterimage::dimensioned::dimensions_type dims - ) const = 0; - - virtual utki::shared_ref make_texture_cube( - rasterimage::image_variant&& positive_x, - rasterimage::image_variant&& negative_x, - rasterimage::image_variant&& positive_y, - rasterimage::image_variant&& negative_y, - rasterimage::image_variant&& positive_z, - rasterimage::image_variant&& negative_z - ) const = 0; - - virtual utki::shared_ref make_vertex_buffer(utki::span> vertices) const = 0; - virtual utki::shared_ref make_vertex_buffer(utki::span> vertices) const = 0; - virtual utki::shared_ref make_vertex_buffer(utki::span> vertices) const = 0; - virtual utki::shared_ref make_vertex_buffer(utki::span vertices) const = 0; - - virtual utki::shared_ref make_index_buffer(utki::span indices) const = 0; - virtual utki::shared_ref make_index_buffer(utki::span indices) const = 0; - - virtual utki::shared_ref make_vertex_array( - std::vector> buffers, - utki::shared_ref indices, - vertex_array::mode rendering_mode - ) const = 0; + // NOTE: the shareable render objects (textures, vertex/index buffers, vertex + // arrays and shaders) are created by the injected render factory (see factory()). + // The only object a context creates is the (per-window) frame buffer. virtual utki::shared_ref make_framebuffer( // std::shared_ptr color, diff --git a/src/ruis/render/factory.hpp b/src/ruis/render/factory.hpp new file mode 100644 index 000000000..fe640d3cd --- /dev/null +++ b/src/ruis/render/factory.hpp @@ -0,0 +1,161 @@ +/* +ruis - GUI framework + +Copyright (C) 2012-2026 Ivan Gagis + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +/* ================ LICENSE END ================ */ + +#pragma once + +#include +#include + +#include +#include +#include +#include +#include + +#include "shaders/coloring_shader.hpp" +#include "shaders/coloring_texturing_shader.hpp" +#include "shaders/shader.hpp" +#include "shaders/texturing_shader.hpp" + +#include "index_buffer.hpp" +#include "native_window.hpp" +#include "texture_2d.hpp" +#include "texture_cube.hpp" +#include "texture_depth.hpp" +#include "texture_stencil.hpp" +#include "vertex_array.hpp" +#include "vertex_buffer.hpp" + +namespace ruis::render { + +/** + * @brief Render object factory. + * + * Owns the shared (headless) rendering context under the hood and is the only place + * that creates the shareable rendering objects (textures, vertex/index buffers, + * vertex arrays, shaders). Objects created by the factory hold a reference to the + * factory (not to a per-window render context), so they can be safely used by any + * render context in the process. + * + * A per-window @ref context is injected with a reference to the factory and is only + * used for state control (scissor, viewport, blending, depth, vsync, current frame + * buffer) and for creating per-window @ref frame_buffer objects via its + * @ref context::make_framebuffer(). + */ +class factory : public std::enable_shared_from_this +{ +protected: + factory() = default; + + virtual ~factory() = default; + + utki::shared_ref get_shared_ref() const + { + return utki::shared_ref(this->shared_from_this()); + } + + /** + * @brief Make the rendering context of the given native window current. + * + * ruis::render::factory is a friend of ruis::render::native_window and can + * therefore call its private bind_rendering_context(). Concrete renderer + * factories use this to make their headless (shared) GL context current. + */ + void bind(ruis::render::native_window& win) const + { + win.bind_rendering_context(); + } + +public: + factory(const factory&) = delete; + factory& operator=(const factory&) = delete; + + factory(factory&&) = delete; + factory& operator=(factory&&) = delete; + + /** + * @brief Rendering shaders. + * The specific shader objects are created by the concrete renderer's make_shaders(). + */ + struct shaders { + std::unique_ptr pos_tex; + std::unique_ptr color_pos; + std::unique_ptr color_pos_lum; + std::unique_ptr pos_clr; + std::unique_ptr color_pos_tex; + std::unique_ptr color_pos_tex_alpha; + }; + + /** + * @brief Create the common rendering shaders. + */ + virtual utki::shared_ref make_shaders() const = 0; + + struct texture_2d_parameters { + texture_2d::filter min_filter = texture_2d::filter::nearest; + texture_2d::filter mag_filter = texture_2d::filter::nearest; + texture_2d::mipmap mipmap = texture_2d::mipmap::none; + }; + + virtual utki::shared_ref make_texture_2d( + rasterimage::format format, + rasterimage::dimensioned::dimensions_type dims, + texture_2d_parameters params + ) const = 0; + + virtual utki::shared_ref make_texture_2d( + const rasterimage::image_variant& imvar, + texture_2d_parameters params + ) const = 0; + + virtual utki::shared_ref make_texture_2d( + rasterimage::image_variant&& imvar, + texture_2d_parameters params + ) const = 0; + + virtual utki::shared_ref make_texture_depth(rasterimage::dimensioned::dimensions_type dims + ) const = 0; + + virtual utki::shared_ref make_texture_cube( + rasterimage::image_variant&& positive_x, + rasterimage::image_variant&& negative_x, + rasterimage::image_variant&& positive_y, + rasterimage::image_variant&& negative_y, + rasterimage::image_variant&& positive_z, + rasterimage::image_variant&& negative_z + ) const = 0; + + virtual utki::shared_ref make_vertex_buffer(utki::span> vertices) const = 0; + virtual utki::shared_ref make_vertex_buffer(utki::span> vertices) const = 0; + virtual utki::shared_ref make_vertex_buffer(utki::span> vertices) const = 0; + virtual utki::shared_ref make_vertex_buffer(utki::span vertices) const = 0; + + virtual utki::shared_ref make_index_buffer(utki::span indices) const = 0; + virtual utki::shared_ref make_index_buffer(utki::span indices) const = 0; + + virtual utki::shared_ref make_vertex_array( + std::vector> buffers, + utki::shared_ref indices, + vertex_array::mode rendering_mode + ) const = 0; +}; + +} // namespace ruis::render diff --git a/src/ruis/render/index_buffer.hpp b/src/ruis/render/index_buffer.hpp index c8c10cf70..cbad4b824 100644 --- a/src/ruis/render/index_buffer.hpp +++ b/src/ruis/render/index_buffer.hpp @@ -25,14 +25,14 @@ along with this program. If not, see . namespace ruis::render { -class context; +class factory; class index_buffer { - const utki::shared_ref rendering_context; + const utki::shared_ref rendering_context; protected: - index_buffer(utki::shared_ref rendering_context) : + index_buffer(utki::shared_ref rendering_context) : rendering_context(std::move(rendering_context)) {} diff --git a/src/ruis/render/native_window.hpp b/src/ruis/render/native_window.hpp index da0cce3d3..3bc96cc6b 100644 --- a/src/ruis/render/native_window.hpp +++ b/src/ruis/render/native_window.hpp @@ -31,6 +31,7 @@ along with this program. If not, see . namespace ruis::render { class context; +class factory; /** * @brief A native OS window. @@ -41,6 +42,7 @@ class context; class native_window { friend class ruis::render::context; + friend class ruis::render::factory; bool is_vsync_enabled_v = false; bool is_fullscreen_v = false; diff --git a/src/ruis/render/renderer.cpp b/src/ruis/render/renderer.cpp index 8659b7935..356b55f63 100644 --- a/src/ruis/render/renderer.cpp +++ b/src/ruis/render/renderer.cpp @@ -27,7 +27,7 @@ using namespace ruis::render; renderer::renderer( utki::shared_ref rendering_context, // - utki::shared_ref common_shaders, + utki::shared_ref common_shaders, utki::shared_ref common_objects ) : rendering_context(std::move(rendering_context)), @@ -35,7 +35,7 @@ renderer::renderer( common_objects(std::move(common_objects)) {} -renderer::objects::objects(const ruis::render::context& rendering_context) : +renderer::objects::objects(const ruis::render::factory& rendering_context) : empty_vertex_array(rendering_context.make_vertex_array( {// rendering_context.make_vertex_buffer(utki::span>()) diff --git a/src/ruis/render/renderer.hpp b/src/ruis/render/renderer.hpp index f2cfa3330..df2088100 100644 --- a/src/ruis/render/renderer.hpp +++ b/src/ruis/render/renderer.hpp @@ -48,10 +48,10 @@ class renderer : public std::enable_shared_from_this return this->rendering_context.get(); } - const utki::shared_ref common_shaders; + const utki::shared_ref common_shaders; struct objects { - objects(const ruis::render::context& rendering_context); + objects(const ruis::render::factory& rendering_context); utki::shared_ref empty_vertex_array; @@ -83,14 +83,14 @@ class renderer : public std::enable_shared_from_this return this->common_objects.get(); } - const ruis::render::context::shaders& shaders() const noexcept + const ruis::render::factory::shaders& shaders() const noexcept { return this->common_shaders.get(); } renderer( utki::shared_ref rendering_context, // - utki::shared_ref common_shaders, + utki::shared_ref common_shaders, utki::shared_ref common_objects ); diff --git a/src/ruis/render/shaders/coloring_shader.hpp b/src/ruis/render/shaders/coloring_shader.hpp index 579c27572..40d18eebd 100644 --- a/src/ruis/render/shaders/coloring_shader.hpp +++ b/src/ruis/render/shaders/coloring_shader.hpp @@ -29,14 +29,14 @@ along with this program. If not, see . namespace ruis::render { -class context; +class factory; class coloring_shader { - const utki::shared_ref rendering_context; + const utki::shared_ref rendering_context; protected: - coloring_shader(utki::shared_ref rendering_context) : + coloring_shader(utki::shared_ref rendering_context) : rendering_context(std::move(rendering_context)) {} diff --git a/src/ruis/render/shaders/coloring_texturing_shader.hpp b/src/ruis/render/shaders/coloring_texturing_shader.hpp index 14fff76e0..84b85f1ff 100644 --- a/src/ruis/render/shaders/coloring_texturing_shader.hpp +++ b/src/ruis/render/shaders/coloring_texturing_shader.hpp @@ -30,14 +30,14 @@ along with this program. If not, see . namespace ruis::render { -class context; +class factory; class coloring_texturing_shader { - const utki::shared_ref rendering_context; + const utki::shared_ref rendering_context; protected: - coloring_texturing_shader(utki::shared_ref rendering_context) : + coloring_texturing_shader(utki::shared_ref rendering_context) : rendering_context(std::move(rendering_context)) {} diff --git a/src/ruis/render/shaders/shader.hpp b/src/ruis/render/shaders/shader.hpp index dd324ce11..20339ddaa 100644 --- a/src/ruis/render/shaders/shader.hpp +++ b/src/ruis/render/shaders/shader.hpp @@ -27,14 +27,14 @@ along with this program. If not, see . namespace ruis::render { -class context; +class factory; class shader { - const utki::shared_ref rendering_context; + const utki::shared_ref rendering_context; protected: - shader(utki::shared_ref rendering_context) : + shader(utki::shared_ref rendering_context) : rendering_context(std::move(rendering_context)) {} diff --git a/src/ruis/render/shaders/texturing_shader.hpp b/src/ruis/render/shaders/texturing_shader.hpp index 1fc4100e8..70bdb9d35 100644 --- a/src/ruis/render/shaders/texturing_shader.hpp +++ b/src/ruis/render/shaders/texturing_shader.hpp @@ -26,14 +26,14 @@ along with this program. If not, see . namespace ruis::render { -class context; +class factory; class texturing_shader { - const utki::shared_ref rendering_context; + const utki::shared_ref rendering_context; protected: - texturing_shader(utki::shared_ref rendering_context) : + texturing_shader(utki::shared_ref rendering_context) : rendering_context(std::move(rendering_context)) {} diff --git a/src/ruis/render/texture_2d.hpp b/src/ruis/render/texture_2d.hpp index 9ffbb4467..75a3a00f7 100644 --- a/src/ruis/render/texture_2d.hpp +++ b/src/ruis/render/texture_2d.hpp @@ -28,11 +28,11 @@ along with this program. If not, see . namespace ruis::render { -class context; +class factory; class texture_2d : public rasterimage::dimensioned { - const utki::shared_ref rendering_context; + const utki::shared_ref rendering_context; public: enum class filter { @@ -48,7 +48,7 @@ class texture_2d : public rasterimage::dimensioned protected: texture_2d( - utki::shared_ref rendering_context, // + utki::shared_ref rendering_context, // r4::vector2 dims ) : rasterimage::dimensioned(dims), diff --git a/src/ruis/render/texture_cube.hpp b/src/ruis/render/texture_cube.hpp index 16eb75bac..da97cbe4b 100644 --- a/src/ruis/render/texture_cube.hpp +++ b/src/ruis/render/texture_cube.hpp @@ -25,14 +25,14 @@ along with this program. If not, see . namespace ruis::render { -class context; +class factory; class texture_cube { - const utki::shared_ref rendering_context; + const utki::shared_ref rendering_context; protected: - texture_cube(utki::shared_ref rendering_context) : + texture_cube(utki::shared_ref rendering_context) : rendering_context(std::move(rendering_context)) {} diff --git a/src/ruis/render/texture_depth.hpp b/src/ruis/render/texture_depth.hpp index 2a5f311b4..c55c0b1f1 100644 --- a/src/ruis/render/texture_depth.hpp +++ b/src/ruis/render/texture_depth.hpp @@ -26,15 +26,15 @@ along with this program. If not, see . namespace ruis::render { -class context; +class factory; class texture_depth : public rasterimage::dimensioned { - const utki::shared_ref rendering_context; + const utki::shared_ref rendering_context; protected: texture_depth( - utki::shared_ref rendering_context, // + utki::shared_ref rendering_context, // r4::vector2 dims ) : rasterimage::dimensioned(dims), diff --git a/src/ruis/render/texture_stencil.hpp b/src/ruis/render/texture_stencil.hpp index 3f8480bd0..272927c6b 100644 --- a/src/ruis/render/texture_stencil.hpp +++ b/src/ruis/render/texture_stencil.hpp @@ -26,15 +26,15 @@ along with this program. If not, see . namespace ruis::render { -class context; +class factory; class texture_stencil : public rasterimage::dimensioned { - const utki::shared_ref rendering_context; + const utki::shared_ref rendering_context; protected: texture_stencil( - utki::shared_ref rendering_context, // + utki::shared_ref rendering_context, // r4::vector2 dims ) : rasterimage::dimensioned(dims), diff --git a/src/ruis/render/vertex_array.cpp b/src/ruis/render/vertex_array.cpp index bb71bd69d..de098aec1 100644 --- a/src/ruis/render/vertex_array.cpp +++ b/src/ruis/render/vertex_array.cpp @@ -26,7 +26,7 @@ along with this program. If not, see . using namespace ruis::render; vertex_array::vertex_array( - utki::shared_ref rendering_context, // + utki::shared_ref rendering_context, // buffers_type buffers, utki::shared_ref indices, mode rendering_mode diff --git a/src/ruis/render/vertex_array.hpp b/src/ruis/render/vertex_array.hpp index 752b72d38..321c189fd 100644 --- a/src/ruis/render/vertex_array.hpp +++ b/src/ruis/render/vertex_array.hpp @@ -31,11 +31,11 @@ along with this program. If not, see . namespace ruis::render { -class context; +class factory; class vertex_array { - const utki::shared_ref rendering_context; + const utki::shared_ref rendering_context; public: using buffers_type = std::vector>; @@ -63,7 +63,7 @@ class vertex_array protected: vertex_array( - utki::shared_ref rendering_context, // + utki::shared_ref rendering_context, // buffers_type buffers, utki::shared_ref indices, mode rendering_mode diff --git a/src/ruis/render/vertex_buffer.hpp b/src/ruis/render/vertex_buffer.hpp index c065909d6..b32b4e257 100644 --- a/src/ruis/render/vertex_buffer.hpp +++ b/src/ruis/render/vertex_buffer.hpp @@ -27,18 +27,18 @@ along with this program. If not, see . namespace ruis::render { -class context; +class factory; class vertex_buffer { - const utki::shared_ref rendering_context; + const utki::shared_ref rendering_context; public: const size_t size; protected: vertex_buffer( - utki::shared_ref rendering_context, // + utki::shared_ref rendering_context, // size_t size ) : rendering_context(std::move(rendering_context)), diff --git a/src/ruis/res/font.cpp b/src/ruis/res/font.cpp index 5a7fb3ef5..029aab7f4 100644 --- a/src/ruis/res/font.cpp +++ b/src/ruis/res/font.cpp @@ -33,7 +33,7 @@ using namespace ruis; using namespace ruis::res; res::font::font( - utki::shared_ref rendering_context, // + utki::shared_ref rendering_context, // utki::shared_ref common_rendering_objects, const fsif::file& file_normal, std::unique_ptr file_bold, @@ -109,7 +109,7 @@ utki::shared_ref res::font::load( } return utki::make_shared( - loader.rendering_context, + loader.factory, loader.common_rendering_objects, fi, std::move(file_bold), diff --git a/src/ruis/res/font.hpp b/src/ruis/res/font.hpp index a5380551f..25af5c054 100644 --- a/src/ruis/res/font.hpp +++ b/src/ruis/res/font.hpp @@ -75,7 +75,7 @@ class font : public ruis::resource public: font( - utki::shared_ref rendering_context, // + utki::shared_ref rendering_context, // utki::shared_ref common_rendering_objects, const fsif::file& file_normal, std::unique_ptr file_bold, diff --git a/src/ruis/res/gradient.cpp b/src/ruis/res/gradient.cpp index 001f47452..734702484 100644 --- a/src/ruis/res/gradient.cpp +++ b/src/ruis/res/gradient.cpp @@ -30,7 +30,7 @@ along with this program. If not, see . using namespace ruis::res; ruis::res::gradient::gradient( - const ruis::render::context& rendering_context, // + const ruis::render::factory& rendering_context, // utki::span> stops, bool vertical ) : @@ -42,7 +42,7 @@ ruis::res::gradient::gradient( {} utki::shared_ref gradient::make_vao( - const ruis::render::context& rendering_context, // + const ruis::render::factory& rendering_context, // utki::span> stops, bool vertical ) @@ -120,7 +120,7 @@ utki::shared_ref gradient::load( } auto ret = utki::make_shared( - loader.rendering_context, + loader.factory, stops, // vertical ); diff --git a/src/ruis/res/gradient.hpp b/src/ruis/res/gradient.hpp index 7c1d769f4..ba16e5996 100644 --- a/src/ruis/res/gradient.hpp +++ b/src/ruis/res/gradient.hpp @@ -62,7 +62,7 @@ class gradient : public resource utki::shared_ref vao; static utki::shared_ref make_vao( - const ruis::render::context& rendering_context, // + const ruis::render::factory& rendering_context, // utki::span> stops, bool vertical ); @@ -78,7 +78,7 @@ class gradient : public resource * @param vertical - is gradient vertical (true) or horizontal (false). */ gradient( - const ruis::render::context& rendering_context, // + const ruis::render::factory& rendering_context, // utki::span> stops, bool vertical ); diff --git a/src/ruis/res/image.cpp b/src/ruis/res/image.cpp index d9ca0a075..3b1bc0fd9 100644 --- a/src/ruis/res/image.cpp +++ b/src/ruis/res/image.cpp @@ -68,7 +68,7 @@ class res_raster_image : public image const fsif::file& fi ) { - return utki::make_shared(loader.rendering_context.get().make_texture_2d( + return utki::make_shared(loader.factory.get().make_texture_2d( rasterimage::read(fi), { // TODO: what about params? @@ -80,14 +80,14 @@ class res_raster_image : public image class res_svg_image : public image { public: - const utki::shared_ref rendering_context; + const utki::shared_ref rendering_context; private: std::unique_ptr dom; public: res_svg_image( // - utki::shared_ref rendering_context, + utki::shared_ref rendering_context, decltype(dom) dom ) : rendering_context(std::move(rendering_context)), @@ -186,7 +186,7 @@ class res_svg_image : public image auto dom = svgdom::load(fi); utki::assert(dom, SL); return utki::make_shared( - loader.rendering_context, // + loader.factory, // std::move(dom) ); } diff --git a/src/ruis/res/nine_patch.cpp b/src/ruis/res/nine_patch.cpp index 7c9c96b5d..4e5f5ad34 100644 --- a/src/ruis/res/nine_patch.cpp +++ b/src/ruis/res/nine_patch.cpp @@ -60,7 +60,7 @@ utki::shared_ref nine_patch::load( ); return utki::make_shared( // - loader.rendering_context, + loader.factory, loader.common_rendering_objects, std::move(image), fraction_borders @@ -69,7 +69,7 @@ utki::shared_ref nine_patch::load( namespace { utki::shared_ref make_quad_vao( - const ruis::render::context& rendering_context, // + const ruis::render::factory& rendering_context, // const ruis::render::renderer::objects& common_rendering_objects, utki::span quad_tex_coords ) @@ -88,7 +88,7 @@ utki::shared_ref make_quad_vao( } // namespace nine_patch::nine_patch( - const ruis::render::context& rendering_context, // + const ruis::render::factory& rendering_context, // const ruis::render::renderer::objects& common_rendering_objects, utki::shared_ref image, sides fraction_borders diff --git a/src/ruis/res/nine_patch.hpp b/src/ruis/res/nine_patch.hpp index 484c5f122..a86ab4386 100644 --- a/src/ruis/res/nine_patch.hpp +++ b/src/ruis/res/nine_patch.hpp @@ -69,7 +69,7 @@ class nine_patch : public resource ~nine_patch() override = default; nine_patch( - const ruis::render::context& rendering_context, + const ruis::render::factory& rendering_context, const ruis::render::renderer::objects& common_rendering_objects, utki::shared_ref image, sides fraction_borders diff --git a/src/ruis/res/texture_2d.cpp b/src/ruis/res/texture_2d.cpp index c2c8387d5..e7127ae08 100644 --- a/src/ruis/res/texture_2d.cpp +++ b/src/ruis/res/texture_2d.cpp @@ -69,7 +69,7 @@ utki::shared_ref texture_2d::load( const fsif::file& fi ) { - ruis::render::context::texture_2d_parameters params{ + ruis::render::factory::texture_2d_parameters params{ .min_filter = render::texture_2d::filter::linear, .mag_filter = render::texture_2d::filter::linear, .mipmap = render::texture_2d::mipmap::nearest @@ -87,7 +87,7 @@ utki::shared_ref texture_2d::load( } } - auto tex = loader.rendering_context.get().make_texture_2d( // + auto tex = loader.factory.get().make_texture_2d( // rasterimage::read(fi), std::move(params) ); diff --git a/src/ruis/res/texture_cube.cpp b/src/ruis/res/texture_cube.cpp index 6209ec472..4b1f949cf 100644 --- a/src/ruis/res/texture_cube.cpp +++ b/src/ruis/res/texture_cube.cpp @@ -81,7 +81,7 @@ utki::shared_ref texture_cube::load( } } - auto tex = loader.rendering_context.get().make_texture_cube( // + auto tex = loader.factory.get().make_texture_cube( // rasterimage::read(fi.set_path(check_not_empty(file_px, file_px_param))), rasterimage::read(fi.set_path(check_not_empty(file_nx, file_nx_param))), rasterimage::read(fi.set_path(check_not_empty(file_py, file_py_param))), diff --git a/src/ruis/resource_loader.hpp b/src/ruis/resource_loader.hpp index 1dbe13759..9eee830db 100644 --- a/src/ruis/resource_loader.hpp +++ b/src/ruis/resource_loader.hpp @@ -67,7 +67,7 @@ class resource_loader friend class resource; public: - const utki::shared_ref rendering_context; + const utki::shared_ref factory; const utki::shared_ref common_rendering_objects; @@ -114,10 +114,10 @@ class resource_loader public: resource_loader( - utki::shared_ref rendering_context, + utki::shared_ref factory, // utki::shared_ref common_rendering_objects ) : - rendering_context(std::move(rendering_context)), + factory(std::move(factory)), common_rendering_objects(std::move(common_rendering_objects)) {} diff --git a/src/ruis/widget/button/touch/tab_group.cpp b/src/ruis/widget/button/touch/tab_group.cpp index 5893a64e0..c6339c965 100644 --- a/src/ruis/widget/button/touch/tab_group.cpp +++ b/src/ruis/widget/button/touch/tab_group.cpp @@ -79,7 +79,7 @@ tab_group::tab_group( }() ), selector_vao( - context.get().loader().rendering_context, // + context.get().loader().factory, // context.get().loader().common_rendering_objects, // {.corner_radii = { diff --git a/src/ruis/widget/label/ellipse.cpp b/src/ruis/widget/label/ellipse.cpp index 75ffef373..6baf208d4 100644 --- a/src/ruis/widget/label/ellipse.cpp +++ b/src/ruis/widget/label/ellipse.cpp @@ -54,8 +54,8 @@ ellipse::ellipse( // ), // clang-format on params(std::move(params.params.specific)), - fill_vao(context.get().loader().rendering_context, {}), - stroke_vao(context.get().loader().rendering_context, {}) + fill_vao(context.get().loader().factory, {}), + stroke_vao(context.get().loader().factory, {}) { this->update_vaos(); } diff --git a/src/ruis/widget/label/rectangle.cpp b/src/ruis/widget/label/rectangle.cpp index 6aea8660b..c4546dccb 100644 --- a/src/ruis/widget/label/rectangle.cpp +++ b/src/ruis/widget/label/rectangle.cpp @@ -50,12 +50,12 @@ rectangle::rectangle( // // clang-format on params(std::move(params.params.specific)), fill_vao( - context.get().loader().rendering_context, // + context.get().loader().factory, // context.get().loader().common_rendering_objects, {} // ), stroke_vao( - context.get().loader().rendering_context, // + context.get().loader().factory, // context.get().loader().common_rendering_objects, {} // ) diff --git a/src/ruis/widget/slider/touch/progress_bar.cpp b/src/ruis/widget/slider/touch/progress_bar.cpp index 69eba40e8..d3ed064b5 100644 --- a/src/ruis/widget/slider/touch/progress_bar.cpp +++ b/src/ruis/widget/slider/touch/progress_bar.cpp @@ -59,7 +59,7 @@ progress_bar::progress_bar( // } return std::move(params.params); }()), - vao(context.get().loader().rendering_context, // + vao(context.get().loader().factory, // context.get().loader().common_rendering_objects, {} // ) diff --git a/src/ruis/widget/slider/touch/scroll_bar.cpp b/src/ruis/widget/slider/touch/scroll_bar.cpp index 3c430db37..323575de9 100644 --- a/src/ruis/widget/slider/touch/scroll_bar.cpp +++ b/src/ruis/widget/slider/touch/scroll_bar.cpp @@ -70,7 +70,7 @@ scroll_bar::scroll_bar( // } return std::move(params.params); }()), - vao(context.get().loader().rendering_context, // + vao(context.get().loader().factory, // context.get().loader().common_rendering_objects, {} // ), diff --git a/src/ruis/widget/widget.cpp b/src/ruis/widget/widget.cpp index 6e5edfd82..fcd33ba39 100644 --- a/src/ruis/widget/widget.cpp +++ b/src/ruis/widget/widget.cpp @@ -273,12 +273,12 @@ utki::shared_ref widget::render_to_texture(std::shared_ptr } return r.rendering_context.get().make_framebuffer( - r.rendering_context.get().make_texture_2d( // + r.rendering_context.get().factory.get().make_texture_2d( // rasterimage::format::rgba, dims, {} ), - this->is_depth_enabled() ? r.rendering_context.get().make_texture_depth(dims) + this->is_depth_enabled() ? r.rendering_context.get().factory.get().make_texture_depth(dims) : std::shared_ptr(nullptr), nullptr ); diff --git a/tests/app1/src/cube_widget.cpp b/tests/app1/src/cube_widget.cpp index 5752a2a3e..a2e7921a9 100644 --- a/tests/app1/src/cube_widget.cpp +++ b/tests/app1/src/cube_widget.cpp @@ -23,8 +23,9 @@ cube_widget::cube_widget( ruis::vec3(-1, -1, 1), ruis::vec3(-1, -1, 1), ruis::vec3(1, -1, -1), ruis::vec3(1, -1, 1)} }; - auto pos_vbo = - this->context.get().renderer.get().rendering_context.get().make_vertex_buffer(utki::make_span(cube_pos)); + auto pos_vbo = this->context.get().renderer.get().rendering_context.get().factory.get().make_vertex_buffer( + utki::make_span(cube_pos) + ); // NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers) std::array cube_tex = { @@ -36,8 +37,9 @@ cube_widget::cube_widget( ruis::vec2(0, 0), ruis::vec2(1, 0), ruis::vec2(0, 1), ruis::vec2(1, 0), ruis::vec2(1, 1), ruis::vec2(0, 1)} }; - auto tex_vbo = - this->context.get().renderer.get().rendering_context.get().make_vertex_buffer(utki::make_span(cube_tex)); + auto tex_vbo = this->context.get().renderer.get().rendering_context.get().factory.get().make_vertex_buffer( + utki::make_span(cube_tex) + ); // NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers) std::array indices = { @@ -47,13 +49,15 @@ cube_widget::cube_widget( } }; - auto cube_indices = - this->context.get().renderer.get().rendering_context.get().make_index_buffer(utki::make_span(indices)); + auto cube_indices = this->context.get().renderer.get().rendering_context.get().factory.get().make_index_buffer( + utki::make_span(indices) + ); this->cubeVAO = this->context.get() .renderer.get() .rendering_context.get() + .factory.get() .make_vertex_array({pos_vbo, tex_vbo}, cube_indices, ruis::render::vertex_array::mode::triangles) .to_shared_ptr(); diff --git a/tests/book/src/cube_page.cpp b/tests/book/src/cube_page.cpp index 89306b239..3af9c9b62 100644 --- a/tests/book/src/cube_page.cpp +++ b/tests/book/src/cube_page.cpp @@ -43,8 +43,9 @@ class cube_widget : public ruis::widget, public ruis::updateable {-1, -1, -1}, {1, -1, -1}, {-1, -1, 1}, {-1, -1, 1}, {1, -1, -1}, {1, -1, 1}} }; - auto pos_vbo = - this->context.get().renderer.get().rendering_context.get().make_vertex_buffer(utki::make_span(cube_pos)); + auto pos_vbo = this->context.get().renderer.get().rendering_context.get().factory.get().make_vertex_buffer( + utki::make_span(cube_pos) + ); std::array cube_tex = { {{0, 0}, {1, 0}, {0, 1}, {1, 0}, {1, 1}, {0, 1}, {0, 0}, {1, 0}, {0, 1}, {1, 0}, {1, 1}, {0, 1}, @@ -52,21 +53,24 @@ class cube_widget : public ruis::widget, public ruis::updateable {0, 0}, {1, 0}, {0, 1}, {1, 0}, {1, 1}, {0, 1}, {0, 0}, {1, 0}, {0, 1}, {1, 0}, {1, 1}, {0, 1}} }; - auto tex_vbo = - this->context.get().renderer.get().rendering_context.get().make_vertex_buffer(utki::make_span(cube_tex)); + auto tex_vbo = this->context.get().renderer.get().rendering_context.get().factory.get().make_vertex_buffer( + utki::make_span(cube_tex) + ); std::array indices = { {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35} }; - auto cube_indices = - this->context.get().renderer.get().rendering_context.get().make_index_buffer(utki::make_span(indices)); + auto cube_indices = this->context.get().renderer.get().rendering_context.get().factory.get().make_index_buffer( + utki::make_span(indices) + ); this->cube_vao = this->context.get() .renderer.get() .rendering_context.get() + .factory.get() .make_vertex_array({pos_vbo, tex_vbo}, cube_indices, ruis::render::vertex_array::mode::triangles) .to_shared_ptr(); diff --git a/tests/harness/util/dummy_context.cpp b/tests/harness/util/dummy_context.cpp index ee8fbb249..eb91f747a 100644 --- a/tests/harness/util/dummy_context.cpp +++ b/tests/harness/util/dummy_context.cpp @@ -1,22 +1,27 @@ #include "dummy_context.hpp" #include +#include #include utki::shared_ref make_dummy_context() { - auto rendering_context = utki::make_shared(); - auto common_objects = utki::make_shared(rendering_context); + auto render_factory = utki::make_shared(); + auto rendering_context = utki::make_shared( + utki::make_shared(), // + render_factory + ); + auto common_objects = utki::make_shared(render_factory.get()); return utki::make_shared(ruis::context::parameters{ .post_to_ui_thread_function = [](std::function) {}, .updater = utki::make_shared(), .renderer = utki::make_shared( rendering_context, // - rendering_context.get().make_shaders(), + render_factory.get().make_shaders(), common_objects ), .style_provider = utki::make_shared(utki::make_shared( - rendering_context, // + render_factory, // common_objects )), .units = ruis::units( diff --git a/tests/paint/src/main.cpp b/tests/paint/src/main.cpp index c337d218b..75f1c8e14 100644 --- a/tests/paint/src/main.cpp +++ b/tests/paint/src/main.cpp @@ -82,7 +82,7 @@ class ellipse_widget : virtual public ruis::widget std::move(params.layout_params), std::move(params.widget) ), - vao(context.get().loader().rendering_context), + vao(context.get().loader().factory), stroke_width(params.stroke_width), color_params(std::move(params.color)) {} @@ -136,11 +136,9 @@ class rectangle_widget : virtual public ruis::widget std::move(params.layout_params), std::move(params.widget) ), - vao( - context.get().loader().rendering_context, // + vao(context.get().loader().factory, // context.get().loader().common_rendering_objects, // - std::move(params.rectangle_vao_params) - ), + std::move(params.rectangle_vao_params)), color_params(std::move(params.color)) {} diff --git a/tests/unit/src/style/style.cpp b/tests/unit/src/style/style.cpp index 6260af458..8316c8762 100644 --- a/tests/unit/src/style/style.cpp +++ b/tests/unit/src/style/style.cpp @@ -1,5 +1,6 @@ #include #include +#include #include #include #include @@ -13,10 +14,10 @@ using namespace std::string_view_literals; namespace { utki::shared_ref make_style_provider() { - auto ren_ctx = utki::make_shared(); + auto ren_factory = utki::make_shared(); auto res_loader = utki::make_shared( - ren_ctx, // - utki::make_shared(ren_ctx) + ren_factory, // + utki::make_shared(ren_factory.get()) ); return utki::make_shared(res_loader); } @@ -119,10 +120,10 @@ const tst::set set("style", [](tst::suite& suite) { } )qwertyuiop"s); - auto ren_ctx = utki::make_shared(); + auto ren_factory = utki::make_shared(); auto res_loader = utki::make_shared( - ren_ctx, // - utki::make_shared(ren_ctx) + ren_factory, // + utki::make_shared(ren_factory.get()) ); ruis::style_provider s(res_loader); From f5aba44b413a20f7edd290bb4e3fc74bd15211dc Mon Sep 17 00:00:00 2001 From: Ivan Gagis Date: Thu, 19 Nov 2026 05:07:53 +0200 Subject: [PATCH 02/11] render: make factory destructor public virtual; bump harness submodules - Make the factory destructor public virtual (matching context) to satisfy the cppcoreguidelines-virtual-class-destructor clang-tidy check. - Bump the tests/harness/modules submodules (ruisapp, ruis-render-opengl, ruis-render-opengles, ruis-render-null) to their ren_factory commits so the CI builds a consistent set (new ruis core + matching ruisapp/renderers). --- src/ruis/render/factory.hpp | 5 +++-- tests/harness/modules/ruis-render-null | 2 +- tests/harness/modules/ruis-render-opengl | 2 +- tests/harness/modules/ruis-render-opengles | 2 +- tests/harness/modules/ruisapp | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/ruis/render/factory.hpp b/src/ruis/render/factory.hpp index fe640d3cd..2dd7d2c38 100644 --- a/src/ruis/render/factory.hpp +++ b/src/ruis/render/factory.hpp @@ -62,11 +62,12 @@ namespace ruis::render { */ class factory : public std::enable_shared_from_this { +public: + virtual ~factory() = default; + protected: factory() = default; - virtual ~factory() = default; - utki::shared_ref get_shared_ref() const { return utki::shared_ref(this->shared_from_this()); diff --git a/tests/harness/modules/ruis-render-null b/tests/harness/modules/ruis-render-null index ad8735386..e4febb420 160000 --- a/tests/harness/modules/ruis-render-null +++ b/tests/harness/modules/ruis-render-null @@ -1 +1 @@ -Subproject commit ad8735386fa0689c2f1a55cd11f19fb55d327579 +Subproject commit e4febb4200842722e0bd1d272c0cca3da28feadb diff --git a/tests/harness/modules/ruis-render-opengl b/tests/harness/modules/ruis-render-opengl index ed3422719..7b2a7ecea 160000 --- a/tests/harness/modules/ruis-render-opengl +++ b/tests/harness/modules/ruis-render-opengl @@ -1 +1 @@ -Subproject commit ed34227198a3de65ba7c037e99f03576030e0d35 +Subproject commit 7b2a7ecea5c337befdf6fec2d2bf2689a84d381d diff --git a/tests/harness/modules/ruis-render-opengles b/tests/harness/modules/ruis-render-opengles index e48a68618..d742586c1 160000 --- a/tests/harness/modules/ruis-render-opengles +++ b/tests/harness/modules/ruis-render-opengles @@ -1 +1 @@ -Subproject commit e48a686189b1cbf68752ec18ed4cfb99d4d59e13 +Subproject commit d742586c1cc6e7dce55adcadb9842a0c3cd0704a diff --git a/tests/harness/modules/ruisapp b/tests/harness/modules/ruisapp index 519b57135..611f403ec 160000 --- a/tests/harness/modules/ruisapp +++ b/tests/harness/modules/ruisapp @@ -1 +1 @@ -Subproject commit 519b571352279ff0867bda8ee1bed491d36bb5e9 +Subproject commit 611f403ec6d28744be9a8c82f45eabb7e7fce4b6 From 6230360f513012e4582220704d5555269c319d34 Mon Sep 17 00:00:00 2001 From: Ivan Gagis Date: Thu, 19 Nov 2026 11:53:42 +0200 Subject: [PATCH 03/11] ci: check out submodules at their pinned commits, not main tips The myci-actions/checkout default is 'remote_recursive', which runs 'git submodule update --remote --recursive' and resets the tests/harness submodules (ruisapp + renderers) to their 'branch = main' tips, ignoring the pinned gitlink commits. That broke the harness build for the factory change (new ruis core vs old main ruisapp/renderers). Set 'submodules: recursive' on the harness/library jobs so the submodules are checked out at the recorded gitlink commits (pinned to the ren_factory commits for now; to be bumped to main once the dependent PRs land). --- .github/workflows/ci.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d5950b1a0..bb139b2f6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,6 +37,8 @@ jobs: # keys-asc: https://apt.llvm.org/llvm-snapshot.gpg.key - name: git clone uses: myci-actions/checkout@main + with: + submodules: recursive - name: prepare debian package run: myci-deb-prepare.sh - name: install deps @@ -110,6 +112,8 @@ jobs: apt install --assume-yes devscripts equivs - name: git clone uses: myci-actions/checkout@main + with: + submodules: recursive - name: prepare debian package run: myci-deb-prepare.sh - name: install deps @@ -136,6 +140,8 @@ jobs: install: myci locales git devscripts equivs - name: git clone uses: myci-actions/checkout@main + with: + submodules: recursive - name: prepare debian package run: myci-deb-prepare.sh - name: install deps @@ -194,6 +200,8 @@ jobs: install: myci git devscripts equivs - name: git clone uses: myci-actions/checkout@main + with: + submodules: recursive - name: set PACKAGE_VERSION uses: myci-actions/export-env-var@main with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh)} @@ -225,6 +233,8 @@ jobs: rm -rf /usr/local/bin/python3*-config - name: git clone uses: myci-actions/checkout@main + with: + submodules: recursive - name: install clang-tidy and clang-format run: | brew install llvm @@ -267,6 +277,8 @@ jobs: steps: - name: git clone uses: myci-actions/checkout@main + with: + submodules: recursive - name: add cppfw deb repo uses: myci-actions/add-deb-repo@main with: @@ -325,6 +337,8 @@ jobs: key-server: https://gagis.hopto.org/repo/cppfw/pubkey.gpg - name: git clone uses: myci-actions/checkout@main + with: + submodules: recursive - name: prepare pacman package run: myci-apply-version.sh build/msys2/PKGBUILD.in - name: build @@ -563,6 +577,8 @@ jobs: sed -i -E "s/compiler.cppstd=.*$/compiler.cppstd=20/g" ~/.conan2/profiles/default - name: git clone uses: myci-actions/checkout@main + with: + submodules: recursive - name: set PACKAGE_VERSION uses: myci-actions/export-env-var@main with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh)} @@ -606,6 +622,8 @@ jobs: ln -s "$(brew --prefix llvm)/bin/clang-apply-replacements" "/usr/local/bin/clang-apply-replacements" - name: git clone uses: myci-actions/checkout@main + with: + submodules: recursive - name: add cppfw tap run: | brew tap cppfw/tap From 675f3dfde1f3e0fe19dee3f343309f32398e6206 Mon Sep 17 00:00:00 2001 From: Ivan Gagis Date: Thu, 19 Nov 2026 12:17:04 +0200 Subject: [PATCH 04/11] Address review comments: rename to factory, fix vao docs, refactor path_vao - texture_font / texture_font_face: rename rendering_context member/param to factory - ellipse_vao / rectangle_vao: drop stale 'resource-loader'/'outlive' doc comments - path_vao: retain only the shared factory; take renderer as a render() parameter; ctor takes (factory, objects) - update tests (paint, wire_area) accordingly --- src/ruis/font/texture_font.cpp | 6 +++--- src/ruis/font/texture_font.hxx | 6 +++--- src/ruis/font/texture_font_face.cpp | 6 +++--- src/ruis/font/texture_font_face.hxx | 4 ++-- src/ruis/paint/ellipse_vao.hpp | 6 +++--- src/ruis/paint/path_vao.cpp | 31 +++++++++++++++++------------ src/ruis/paint/path_vao.hpp | 13 +++++++++--- src/ruis/paint/rectangle_vao.hpp | 8 +++++--- tests/paint/src/main.cpp | 4 ++-- tests/wire_area/src/wire_area.cpp | 14 +++++++++---- 10 files changed, 59 insertions(+), 39 deletions(-) diff --git a/src/ruis/font/texture_font.cpp b/src/ruis/font/texture_font.cpp index 94000e28e..3315c7c31 100644 --- a/src/ruis/font/texture_font.cpp +++ b/src/ruis/font/texture_font.cpp @@ -175,7 +175,7 @@ texture_font::glyph texture_font::load_glyph(char32_t c) const g.top_left = ftg.vertices[0]; g.bottom_right = ftg.vertices[2]; - auto& rc = this->rendering_context.get(); + auto& rc = this->factory.get(); // clang-format off g.vao = rc.make_vertex_array( @@ -201,13 +201,13 @@ texture_font::glyph texture_font::load_glyph(char32_t c) const } texture_font::texture_font( - utki::shared_ref rendering_context, // + utki::shared_ref factory, // utki::shared_ref common_rendering_objects, utki::shared_ref face, unsigned font_size, unsigned max_cached ) : - rendering_context(std::move(rendering_context)), + factory(std::move(factory)), common_rendering_objects(std::move(common_rendering_objects)), font_size(font_size), face(std::move(face)), diff --git a/src/ruis/font/texture_font.hxx b/src/ruis/font/texture_font.hxx index 9392035e4..0c6fa1fad 100644 --- a/src/ruis/font/texture_font.hxx +++ b/src/ruis/font/texture_font.hxx @@ -104,7 +104,7 @@ public: */ class texture_font : public font { - const utki::shared_ref rendering_context; + const utki::shared_ref factory; const utki::shared_ref common_rendering_objects; const unsigned font_size; @@ -137,13 +137,13 @@ class texture_font : public font public: /** * @brief Constructor. - * @param renderer - ruis renderer. + * @param factory - render factory to create the glyph textures and vertex arrays in. * @param face - freetype font. * @param font_size - size of the font in pixels. * @param max_cached - maximum number of glyphs to cache. */ texture_font( - utki::shared_ref rendering_context, // + utki::shared_ref factory, // utki::shared_ref common_rendering_objects, utki::shared_ref face, unsigned font_size, diff --git a/src/ruis/font/texture_font_face.cpp b/src/ruis/font/texture_font_face.cpp index 2b18b4e0e..59176f7b2 100644 --- a/src/ruis/font/texture_font_face.cpp +++ b/src/ruis/font/texture_font_face.cpp @@ -24,12 +24,12 @@ along with this program. If not, see . using namespace ruis; texture_font_face::texture_font_face( - utki::shared_ref rendering_context, // + utki::shared_ref factory, // utki::shared_ref common_rendering_objects, utki::shared_ref face, unsigned max_cached ) : - rendering_context(std::move(rendering_context)), + factory(std::move(factory)), common_rendering_objects(std::move(common_rendering_objects)), face(std::move(face)), max_cached(max_cached) @@ -38,7 +38,7 @@ texture_font_face::texture_font_face( utki::shared_ref texture_font_face::create(real size) const { return utki::make_shared( - this->rendering_context, // + this->factory, // this->common_rendering_objects, this->face, unsigned(size), diff --git a/src/ruis/font/texture_font_face.hxx b/src/ruis/font/texture_font_face.hxx index 979ee8d39..1d00bcdff 100644 --- a/src/ruis/font/texture_font_face.hxx +++ b/src/ruis/font/texture_font_face.hxx @@ -28,7 +28,7 @@ namespace ruis { class texture_font_face : public font_face { - const utki::shared_ref rendering_context; + const utki::shared_ref factory; const utki::shared_ref common_rendering_objects; const utki::shared_ref face; @@ -36,7 +36,7 @@ class texture_font_face : public font_face public: texture_font_face( - utki::shared_ref rendering_context, // + utki::shared_ref factory, // utki::shared_ref common_rendering_objects, utki::shared_ref face, unsigned max_cached diff --git a/src/ruis/paint/ellipse_vao.hpp b/src/ruis/paint/ellipse_vao.hpp index c2366980d..7fa60b086 100644 --- a/src/ruis/paint/ellipse_vao.hpp +++ b/src/ruis/paint/ellipse_vao.hpp @@ -32,8 +32,8 @@ namespace ruis::paint { */ class ellipse_vao { - // the render factory in which the ellipse texture is created; it must outlive - // this VAO, so use the shared resource-loader factory + // the shared render factory in which the ellipse texture is created; it is + // retained so that set() can create a new texture when the parameters change utki::shared_ref factory; vec2 diameters = 0; @@ -44,7 +44,7 @@ class ellipse_vao public: /** * @brief Constructor. - * @param factory - render factory to create the ellipse texture in (must outlive this VAO). + * @param factory - render factory to create the ellipse texture in. * @param diameters - ellipse diameters. * @param stroke_width - ellipse border width. Non-positive value means filled ellipse. */ diff --git a/src/ruis/paint/path_vao.cpp b/src/ruis/paint/path_vao.cpp index e95695156..9707762a0 100644 --- a/src/ruis/paint/path_vao.cpp +++ b/src/ruis/paint/path_vao.cpp @@ -23,46 +23,51 @@ along with this program. If not, see . using namespace ruis::paint; -// NOLINTNEXTLINE(modernize-pass-by-value) -path_vao::path_vao(utki::shared_ref r) : - renderer(std::move(r)), - core(this->renderer.get().obj().empty_vertex_array), - border(this->renderer.get().obj().empty_vertex_array) +path_vao::path_vao( + utki::shared_ref factory, // + const ruis::render::renderer::objects& objects +) : + factory(std::move(factory)), + core(objects.empty_vertex_array), + border(objects.empty_vertex_array) {} void path_vao::set(const path::vertices& path) { - auto core_buf = this->renderer.get().rendering_context.get().factory.get().make_vertex_buffer(path.pos); + auto& f = this->factory.get(); - this->core = this->renderer.get().rendering_context.get().factory.get().make_vertex_array( + auto core_buf = f.make_vertex_buffer(path.pos); + + this->core = f.make_vertex_array( { core_buf, }, - this->renderer.get().rendering_context.get().factory.get().make_index_buffer(path.in_indices), + f.make_index_buffer(path.in_indices), ruis::render::vertex_array::mode::triangle_strip ); - this->border = this->renderer.get().rendering_context.get().factory.get().make_vertex_array( + this->border = f.make_vertex_array( { core_buf, - this->renderer.get().rendering_context.get().factory.get().make_vertex_buffer(path.alpha), + f.make_vertex_buffer(path.alpha), }, - this->renderer.get().rendering_context.get().factory.get().make_index_buffer(path.out_indices), + f.make_index_buffer(path.out_indices), ruis::render::vertex_array::mode::triangle_strip ); } void path_vao::render( + const ruis::render::renderer& renderer, // const ruis::mat4& matrix, // ruis::color color ) const { - this->renderer.get().shaders().color_pos->render( + renderer.shaders().color_pos->render( matrix, // this->core.get(), color ); - this->renderer.get().shaders().color_pos_lum->render( + renderer.shaders().color_pos_lum->render( matrix, // this->border.get(), color diff --git a/src/ruis/paint/path_vao.hpp b/src/ruis/paint/path_vao.hpp index 10bc87403..fbdb0d16a 100644 --- a/src/ruis/paint/path_vao.hpp +++ b/src/ruis/paint/path_vao.hpp @@ -35,7 +35,8 @@ namespace ruis::paint { */ class path_vao { - utki::shared_ref renderer; + // the shared render factory in which the path vertex arrays are created + utki::shared_ref factory; utki::shared_ref core; utki::shared_ref border; @@ -43,9 +44,13 @@ class path_vao public: /** * @brief Constructor. - * @param r - renderer to use. + * @param factory - render factory to create the path vertex arrays in. + * @param objects - shared objects used to initialise the (empty) vertex arrays. */ - path_vao(utki::shared_ref r); + path_vao( + utki::shared_ref factory, // + const ruis::render::renderer::objects& objects + ); path_vao(const path_vao&) = delete; path_vao& operator=(const path_vao&) = delete; @@ -69,10 +74,12 @@ class path_vao /** * @brief Render the path. + * @param renderer - renderer to draw with. * @param matrix - model-view-projection matrix. * @param color - color to render the path with. */ void render( + const ruis::render::renderer& renderer, // const ruis::mat4& matrix, // ruis::color color ) const; diff --git a/src/ruis/paint/rectangle_vao.hpp b/src/ruis/paint/rectangle_vao.hpp index ef66990cd..975e81ad9 100644 --- a/src/ruis/paint/rectangle_vao.hpp +++ b/src/ruis/paint/rectangle_vao.hpp @@ -34,8 +34,9 @@ namespace ruis::paint { */ class rectangle_vao { - // the render factory in which the rounded-corners texture and corner VAOs are - // created; it must outlive this VAO, so use the shared resource-loader factory + // the shared render factory in which the rounded-corners texture and corner + // VAOs are created; it is retained so that set() can create a new texture when + // the parameters change utki::shared_ref factory; // shared objects used to build the corner VAOs utki::shared_ref objects; @@ -81,7 +82,8 @@ class rectangle_vao public: /** * @brief Constructor. - * @param renderer - renderer to use. + * @param factory - render factory to create the rounded-corners texture and corner VAOs in. + * @param objects - shared objects used to build the corner VAOs. * @param params - rectangle rendering parameters. */ rectangle_vao( diff --git a/tests/paint/src/main.cpp b/tests/paint/src/main.cpp index 75f1c8e14..91383a0ed 100644 --- a/tests/paint/src/main.cpp +++ b/tests/paint/src/main.cpp @@ -32,12 +32,12 @@ class path_widget : virtual public ruis::widget std::move(params.layout_params), std::move(params.widget) ), - vao(context.get().renderer) + vao(context.get().loader().factory, context.get().loader().common_rendering_objects.get()) {} void render(const ruis::mat4& matrix) const override { - this->vao.render(matrix, 0xff00ffff); + this->vao.render(this->context.get().renderer.get(), matrix, 0xff00ffff); } void on_resize() override diff --git a/tests/wire_area/src/wire_area.cpp b/tests/wire_area/src/wire_area.cpp index dfe25c0d4..b896cdd0f 100644 --- a/tests/wire_area/src/wire_area.cpp +++ b/tests/wire_area/src/wire_area.cpp @@ -51,10 +51,13 @@ void wire_area::render(const ruis::mat4& matrix) const ruis::paint::path path; path.cubic_to(prim_outlet_pos[1] * spline_control_length, p + slave_outlet_pos[1] * spline_control_length, p); - ruis::paint::path_vao vba(this->context.get().renderer); + ruis::paint::path_vao vba( + this->context.get().loader().factory, + this->context.get().loader().common_rendering_objects.get() + ); vba.set(path.stroke(this->wire_half_width, antialias_width, 1)); - vba.render(ruis::mat4(matrix).translate(p0), this->wire_color); + vba.render(this->context.get().renderer.get(), ruis::mat4(matrix).translate(p0), this->wire_color); } if (this->grabbed_socket) { @@ -64,10 +67,13 @@ void wire_area::render(const ruis::mat4& matrix) const ruis::paint::path path; path.line_to(this->mouse_pos - p0); - ruis::paint::path_vao vba(this->context.get().renderer); + ruis::paint::path_vao vba( + this->context.get().loader().factory, + this->context.get().loader().common_rendering_objects.get() + ); vba.set(path.stroke(this->wire_half_width, antialias_width, 1)); - vba.render(ruis::mat4(matrix).translate(p0), this->grabbed_color); + vba.render(this->context.get().renderer.get(), ruis::mat4(matrix).translate(p0), this->grabbed_color); } } From 7f1f10b482b5a677043af9c2a4f699872a4d2a29 Mon Sep 17 00:00:00 2001 From: Ivan Gagis Date: Thu, 19 Nov 2026 15:05:58 +0200 Subject: [PATCH 05/11] review fixes: context factory member -> fac() accessor; rename rendering_context members to factory - Convert the public context::factory member to a private factory_ref member plus a public fac() accessor (avoids the name clash with the ruis::render::factory type and the public-member design smell). - Rename the rendering_context members/params to factory in the shareable object and shader base classes and res/* helpers. - Update all callers to use context.fac(). - CI: use 'submodules: true' (no nested submodules) for the checkout. --- .github/workflows/ci.yml | 18 +++++----- src/ruis/render/context.cpp | 2 +- src/ruis/render/context.hpp | 10 ++++-- src/ruis/render/index_buffer.hpp | 6 ++-- src/ruis/render/renderer.cpp | 34 +++++++++---------- src/ruis/render/renderer.hpp | 2 +- src/ruis/render/shaders/coloring_shader.hpp | 6 ++-- .../shaders/coloring_texturing_shader.hpp | 6 ++-- src/ruis/render/shaders/shader.hpp | 6 ++-- src/ruis/render/shaders/texturing_shader.hpp | 6 ++-- src/ruis/render/texture_2d.hpp | 6 ++-- src/ruis/render/texture_cube.hpp | 6 ++-- src/ruis/render/texture_depth.hpp | 6 ++-- src/ruis/render/texture_stencil.hpp | 6 ++-- src/ruis/render/vertex_array.cpp | 4 +-- src/ruis/render/vertex_array.hpp | 4 +-- src/ruis/render/vertex_buffer.hpp | 6 ++-- src/ruis/res/font.cpp | 10 +++--- src/ruis/res/font.hpp | 2 +- src/ruis/res/gradient.cpp | 14 ++++---- src/ruis/res/gradient.hpp | 6 ++-- src/ruis/res/image.cpp | 8 ++--- src/ruis/res/nine_patch.cpp | 26 +++++++------- src/ruis/res/nine_patch.hpp | 2 +- src/ruis/widget/widget.cpp | 4 +-- tests/app1/src/cube_widget.cpp | 8 ++--- tests/book/src/cube_page.cpp | 8 ++--- tests/harness/modules/ruisapp | 2 +- 28 files changed, 114 insertions(+), 110 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bb139b2f6..8f926c936 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,7 +38,7 @@ jobs: - name: git clone uses: myci-actions/checkout@main with: - submodules: recursive + submodules: true - name: prepare debian package run: myci-deb-prepare.sh - name: install deps @@ -113,7 +113,7 @@ jobs: - name: git clone uses: myci-actions/checkout@main with: - submodules: recursive + submodules: true - name: prepare debian package run: myci-deb-prepare.sh - name: install deps @@ -141,7 +141,7 @@ jobs: - name: git clone uses: myci-actions/checkout@main with: - submodules: recursive + submodules: true - name: prepare debian package run: myci-deb-prepare.sh - name: install deps @@ -201,7 +201,7 @@ jobs: - name: git clone uses: myci-actions/checkout@main with: - submodules: recursive + submodules: true - name: set PACKAGE_VERSION uses: myci-actions/export-env-var@main with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh)} @@ -234,7 +234,7 @@ jobs: - name: git clone uses: myci-actions/checkout@main with: - submodules: recursive + submodules: true - name: install clang-tidy and clang-format run: | brew install llvm @@ -278,7 +278,7 @@ jobs: - name: git clone uses: myci-actions/checkout@main with: - submodules: recursive + submodules: true - name: add cppfw deb repo uses: myci-actions/add-deb-repo@main with: @@ -338,7 +338,7 @@ jobs: - name: git clone uses: myci-actions/checkout@main with: - submodules: recursive + submodules: true - name: prepare pacman package run: myci-apply-version.sh build/msys2/PKGBUILD.in - name: build @@ -578,7 +578,7 @@ jobs: - name: git clone uses: myci-actions/checkout@main with: - submodules: recursive + submodules: true - name: set PACKAGE_VERSION uses: myci-actions/export-env-var@main with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh)} @@ -623,7 +623,7 @@ jobs: - name: git clone uses: myci-actions/checkout@main with: - submodules: recursive + submodules: true - name: add cppfw tap run: | brew tap cppfw/tap diff --git a/src/ruis/render/context.cpp b/src/ruis/render/context.cpp index e93fa617f..36b411649 100644 --- a/src/ruis/render/context.cpp +++ b/src/ruis/render/context.cpp @@ -30,8 +30,8 @@ context::context( utki::shared_ref factory, // parameters params ) : + factory_ref(std::move(factory)), native_window(std::move(native_window)), - factory(std::move(factory)), initial_matrix(std::move(params.initial_matrix)) { // insert this context to the bottom of the current contexts stack diff --git a/src/ruis/render/context.hpp b/src/ruis/render/context.hpp index bcc981c92..e61f5d958 100644 --- a/src/ruis/render/context.hpp +++ b/src/ruis/render/context.hpp @@ -51,6 +51,7 @@ class context : public std::enable_shared_from_this private: std::weak_ptr cur_fb; + const utki::shared_ref factory_ref; public: /** @@ -67,13 +68,16 @@ class context : public std::enable_shared_from_this const utki::shared_ref native_window; /** - * @brief The render factory injected into this context. + * @brief Get the render factory injected into this context. * All shareable render objects (textures, buffers, vertex arrays, shaders) are * created by the factory and hold a reference to it, so they can be used by any * render context in the process. This context is only for state control and for * creating per-window frame buffers. */ - const utki::shared_ref factory; + const factory& fac() const noexcept + { + return this->factory_ref.get(); + } struct parameters { r4::matrix4 initial_matrix; @@ -132,7 +136,7 @@ class context : public std::enable_shared_from_this // =============================== // ====== factory functions ====== // NOTE: the shareable render objects (textures, vertex/index buffers, vertex - // arrays and shaders) are created by the injected render factory (see factory()). + // arrays and shaders) are created by the injected render factory (see fac()). // The only object a context creates is the (per-window) frame buffer. virtual utki::shared_ref make_framebuffer( // diff --git a/src/ruis/render/index_buffer.hpp b/src/ruis/render/index_buffer.hpp index cbad4b824..6d497259e 100644 --- a/src/ruis/render/index_buffer.hpp +++ b/src/ruis/render/index_buffer.hpp @@ -29,11 +29,11 @@ class factory; class index_buffer { - const utki::shared_ref rendering_context; + const utki::shared_ref factory; protected: - index_buffer(utki::shared_ref rendering_context) : - rendering_context(std::move(rendering_context)) + index_buffer(utki::shared_ref factory) : + factory(std::move(factory)) {} public: diff --git a/src/ruis/render/renderer.cpp b/src/ruis/render/renderer.cpp index 356b55f63..99b5cec00 100644 --- a/src/ruis/render/renderer.cpp +++ b/src/ruis/render/renderer.cpp @@ -35,27 +35,27 @@ renderer::renderer( common_objects(std::move(common_objects)) {} -renderer::objects::objects(const ruis::render::factory& rendering_context) : - empty_vertex_array(rendering_context.make_vertex_array( +renderer::objects::objects(const ruis::render::factory& factory) : + empty_vertex_array(factory.make_vertex_array( {// - rendering_context.make_vertex_buffer(utki::span>()) + factory.make_vertex_buffer(utki::span>()) }, - rendering_context.make_index_buffer(utki::span()), + factory.make_index_buffer(utki::span()), ruis::render::vertex_array::mode::triangle_strip )), - quad_01_vbo(rendering_context.make_vertex_buffer(utki::make_span(std::array{ + quad_01_vbo(factory.make_vertex_buffer(utki::make_span(std::array{ vec2(0, 0), // vec2(0, 1), vec2(1, 1), vec2(1, 0) }))), - quad_fan_indices(rendering_context.make_index_buffer(utki::make_span(std::array{0, 1, 2, 3}))), - pos_quad_01_vao(rendering_context.make_vertex_array( + quad_fan_indices(factory.make_index_buffer(utki::make_span(std::array{0, 1, 2, 3}))), + pos_quad_01_vao(factory.make_vertex_array( {this->quad_01_vbo}, this->quad_fan_indices, vertex_array::mode::triangle_fan )), - pos_tex_quad_01_vao(rendering_context.make_vertex_array( + pos_tex_quad_01_vao(factory.make_vertex_array( {this->quad_01_vbo, this->quad_01_vbo}, this->quad_fan_indices, vertex_array::mode::triangle_fan @@ -64,10 +64,10 @@ renderer::objects::objects(const ruis::render::factory& rendering_context) : pos_tex_texture_quadrants_01_vaos( { // left-top - rendering_context.make_vertex_array( + factory.make_vertex_array( { this->quad_01_vbo, - rendering_context.make_vertex_buffer(utki::make_span(std::array{ + factory.make_vertex_buffer(utki::make_span(std::array{ vec2(0, 0), // vec2(0, utki::half), vec2(utki::half, utki::half), @@ -78,10 +78,10 @@ renderer::objects::objects(const ruis::render::factory& rendering_context) : vertex_array::mode::triangle_fan ), // right-top - rendering_context.make_vertex_array( + factory.make_vertex_array( { this->quad_01_vbo, - rendering_context.make_vertex_buffer(utki::make_span(std::array{ + factory.make_vertex_buffer(utki::make_span(std::array{ vec2(utki::half, 0), // vec2(utki::half, utki::half), vec2(1, utki::half), @@ -92,10 +92,10 @@ renderer::objects::objects(const ruis::render::factory& rendering_context) : vertex_array::mode::triangle_fan ), // right-bottom - rendering_context.make_vertex_array( + factory.make_vertex_array( { this->quad_01_vbo, - rendering_context.make_vertex_buffer(utki::make_span(std::array{ + factory.make_vertex_buffer(utki::make_span(std::array{ vec2(utki::half, utki::half), // vec2(utki::half, 1), vec2(1, 1), @@ -106,10 +106,10 @@ renderer::objects::objects(const ruis::render::factory& rendering_context) : vertex_array::mode::triangle_fan ), // left-bottom - rendering_context.make_vertex_array( + factory.make_vertex_array( { this->quad_01_vbo, - rendering_context.make_vertex_buffer(utki::make_span(std::array{ + factory.make_vertex_buffer(utki::make_span(std::array{ vec2(0, utki::half), // vec2(0, 1), vec2(utki::half, 1), @@ -123,7 +123,7 @@ renderer::objects::objects(const ruis::render::factory& rendering_context) : ), // clang-format on white_texture( - rendering_context.make_texture_2d( + factory.make_texture_2d( []() { // raster image 1 by 1 pixel rasterimage::image_variant imvar( diff --git a/src/ruis/render/renderer.hpp b/src/ruis/render/renderer.hpp index df2088100..5a018d3b4 100644 --- a/src/ruis/render/renderer.hpp +++ b/src/ruis/render/renderer.hpp @@ -51,7 +51,7 @@ class renderer : public std::enable_shared_from_this const utki::shared_ref common_shaders; struct objects { - objects(const ruis::render::factory& rendering_context); + objects(const ruis::render::factory& factory); utki::shared_ref empty_vertex_array; diff --git a/src/ruis/render/shaders/coloring_shader.hpp b/src/ruis/render/shaders/coloring_shader.hpp index 40d18eebd..c67fa2a3d 100644 --- a/src/ruis/render/shaders/coloring_shader.hpp +++ b/src/ruis/render/shaders/coloring_shader.hpp @@ -33,11 +33,11 @@ class factory; class coloring_shader { - const utki::shared_ref rendering_context; + const utki::shared_ref factory; protected: - coloring_shader(utki::shared_ref rendering_context) : - rendering_context(std::move(rendering_context)) + coloring_shader(utki::shared_ref factory) : + factory(std::move(factory)) {} public: diff --git a/src/ruis/render/shaders/coloring_texturing_shader.hpp b/src/ruis/render/shaders/coloring_texturing_shader.hpp index 84b85f1ff..3edb76078 100644 --- a/src/ruis/render/shaders/coloring_texturing_shader.hpp +++ b/src/ruis/render/shaders/coloring_texturing_shader.hpp @@ -34,11 +34,11 @@ class factory; class coloring_texturing_shader { - const utki::shared_ref rendering_context; + const utki::shared_ref factory; protected: - coloring_texturing_shader(utki::shared_ref rendering_context) : - rendering_context(std::move(rendering_context)) + coloring_texturing_shader(utki::shared_ref factory) : + factory(std::move(factory)) {} public: diff --git a/src/ruis/render/shaders/shader.hpp b/src/ruis/render/shaders/shader.hpp index 20339ddaa..8b143bb37 100644 --- a/src/ruis/render/shaders/shader.hpp +++ b/src/ruis/render/shaders/shader.hpp @@ -31,11 +31,11 @@ class factory; class shader { - const utki::shared_ref rendering_context; + const utki::shared_ref factory; protected: - shader(utki::shared_ref rendering_context) : - rendering_context(std::move(rendering_context)) + shader(utki::shared_ref factory) : + factory(std::move(factory)) {} public: diff --git a/src/ruis/render/shaders/texturing_shader.hpp b/src/ruis/render/shaders/texturing_shader.hpp index 70bdb9d35..39a8b55fd 100644 --- a/src/ruis/render/shaders/texturing_shader.hpp +++ b/src/ruis/render/shaders/texturing_shader.hpp @@ -30,11 +30,11 @@ class factory; class texturing_shader { - const utki::shared_ref rendering_context; + const utki::shared_ref factory; protected: - texturing_shader(utki::shared_ref rendering_context) : - rendering_context(std::move(rendering_context)) + texturing_shader(utki::shared_ref factory) : + factory(std::move(factory)) {} public: diff --git a/src/ruis/render/texture_2d.hpp b/src/ruis/render/texture_2d.hpp index 75a3a00f7..8b10b7781 100644 --- a/src/ruis/render/texture_2d.hpp +++ b/src/ruis/render/texture_2d.hpp @@ -32,7 +32,7 @@ class factory; class texture_2d : public rasterimage::dimensioned { - const utki::shared_ref rendering_context; + const utki::shared_ref factory; public: enum class filter { @@ -48,11 +48,11 @@ class texture_2d : public rasterimage::dimensioned protected: texture_2d( - utki::shared_ref rendering_context, // + utki::shared_ref factory, // r4::vector2 dims ) : rasterimage::dimensioned(dims), - rendering_context(std::move(rendering_context)) + factory(std::move(factory)) {} public: diff --git a/src/ruis/render/texture_cube.hpp b/src/ruis/render/texture_cube.hpp index da97cbe4b..9dbeb3c38 100644 --- a/src/ruis/render/texture_cube.hpp +++ b/src/ruis/render/texture_cube.hpp @@ -29,11 +29,11 @@ class factory; class texture_cube { - const utki::shared_ref rendering_context; + const utki::shared_ref factory; protected: - texture_cube(utki::shared_ref rendering_context) : - rendering_context(std::move(rendering_context)) + texture_cube(utki::shared_ref factory) : + factory(std::move(factory)) {} public: diff --git a/src/ruis/render/texture_depth.hpp b/src/ruis/render/texture_depth.hpp index c55c0b1f1..ed460aa7d 100644 --- a/src/ruis/render/texture_depth.hpp +++ b/src/ruis/render/texture_depth.hpp @@ -30,15 +30,15 @@ class factory; class texture_depth : public rasterimage::dimensioned { - const utki::shared_ref rendering_context; + const utki::shared_ref factory; protected: texture_depth( - utki::shared_ref rendering_context, // + utki::shared_ref factory, // r4::vector2 dims ) : rasterimage::dimensioned(dims), - rendering_context(std::move(rendering_context)) + factory(std::move(factory)) {} public: diff --git a/src/ruis/render/texture_stencil.hpp b/src/ruis/render/texture_stencil.hpp index 272927c6b..7c3605095 100644 --- a/src/ruis/render/texture_stencil.hpp +++ b/src/ruis/render/texture_stencil.hpp @@ -30,15 +30,15 @@ class factory; class texture_stencil : public rasterimage::dimensioned { - const utki::shared_ref rendering_context; + const utki::shared_ref factory; protected: texture_stencil( - utki::shared_ref rendering_context, // + utki::shared_ref factory, // r4::vector2 dims ) : rasterimage::dimensioned(dims), - rendering_context(std::move(rendering_context)) + factory(std::move(factory)) {} public: diff --git a/src/ruis/render/vertex_array.cpp b/src/ruis/render/vertex_array.cpp index de098aec1..84a7c5003 100644 --- a/src/ruis/render/vertex_array.cpp +++ b/src/ruis/render/vertex_array.cpp @@ -26,12 +26,12 @@ along with this program. If not, see . using namespace ruis::render; vertex_array::vertex_array( - utki::shared_ref rendering_context, // + utki::shared_ref factory, // buffers_type buffers, utki::shared_ref indices, mode rendering_mode ) : - rendering_context(std::move(rendering_context)), + factory(std::move(factory)), buffers(std::move(buffers)), indices(std::move(indices)), rendering_mode(rendering_mode) diff --git a/src/ruis/render/vertex_array.hpp b/src/ruis/render/vertex_array.hpp index 321c189fd..1fb5f878f 100644 --- a/src/ruis/render/vertex_array.hpp +++ b/src/ruis/render/vertex_array.hpp @@ -35,7 +35,7 @@ class factory; class vertex_array { - const utki::shared_ref rendering_context; + const utki::shared_ref factory; public: using buffers_type = std::vector>; @@ -63,7 +63,7 @@ class vertex_array protected: vertex_array( - utki::shared_ref rendering_context, // + utki::shared_ref factory, // buffers_type buffers, utki::shared_ref indices, mode rendering_mode diff --git a/src/ruis/render/vertex_buffer.hpp b/src/ruis/render/vertex_buffer.hpp index b32b4e257..0fa7b7b37 100644 --- a/src/ruis/render/vertex_buffer.hpp +++ b/src/ruis/render/vertex_buffer.hpp @@ -31,17 +31,17 @@ class factory; class vertex_buffer { - const utki::shared_ref rendering_context; + const utki::shared_ref factory; public: const size_t size; protected: vertex_buffer( - utki::shared_ref rendering_context, // + utki::shared_ref factory, // size_t size ) : - rendering_context(std::move(rendering_context)), + factory(std::move(factory)), size(size) {} diff --git a/src/ruis/res/font.cpp b/src/ruis/res/font.cpp index 029aab7f4..40574b41c 100644 --- a/src/ruis/res/font.cpp +++ b/src/ruis/res/font.cpp @@ -33,7 +33,7 @@ using namespace ruis; using namespace ruis::res; res::font::font( - utki::shared_ref rendering_context, // + utki::shared_ref factory, // utki::shared_ref common_rendering_objects, const fsif::file& file_normal, std::unique_ptr file_bold, @@ -44,7 +44,7 @@ res::font::font( { // NOLINTNEXTLINE(bugprone-unused-return-value, "false positive") this->font_faces[style::normal] = std::make_unique( - rendering_context, // + factory, // common_rendering_objects, utki::make_shared(file_normal), max_cached @@ -53,7 +53,7 @@ res::font::font( if (file_bold) { // NOLINTNEXTLINE(bugprone-unused-return-value, "false positive") this->font_faces[style::bold] = std::make_unique( - rendering_context, // + factory, // common_rendering_objects, utki::make_shared(*file_bold), max_cached @@ -62,7 +62,7 @@ res::font::font( if (file_italic) { // NOLINTNEXTLINE(bugprone-unused-return-value, "false positive") this->font_faces[style::italic] = std::make_unique( - rendering_context, // + factory, // common_rendering_objects, utki::make_shared(*file_italic), max_cached @@ -71,7 +71,7 @@ res::font::font( if (file_bold_italic) { // NOLINTNEXTLINE(bugprone-unused-return-value, "false positive") this->font_faces[style::bold_italic] = std::make_unique( - std::move(rendering_context), // + std::move(factory), // std::move(common_rendering_objects), utki::make_shared(*file_bold_italic), max_cached diff --git a/src/ruis/res/font.hpp b/src/ruis/res/font.hpp index 25af5c054..15cc1a839 100644 --- a/src/ruis/res/font.hpp +++ b/src/ruis/res/font.hpp @@ -75,7 +75,7 @@ class font : public ruis::resource public: font( - utki::shared_ref rendering_context, // + utki::shared_ref factory, // utki::shared_ref common_rendering_objects, const fsif::file& file_normal, std::unique_ptr file_bold, diff --git a/src/ruis/res/gradient.cpp b/src/ruis/res/gradient.cpp index 734702484..44576c039 100644 --- a/src/ruis/res/gradient.cpp +++ b/src/ruis/res/gradient.cpp @@ -30,19 +30,19 @@ along with this program. If not, see . using namespace ruis::res; ruis::res::gradient::gradient( - const ruis::render::factory& rendering_context, // + const ruis::render::factory& factory, // utki::span> stops, bool vertical ) : vao(make_vao( - rendering_context, // + factory, // stops, vertical )) {} utki::shared_ref gradient::make_vao( - const ruis::render::factory& rendering_context, // + const ruis::render::factory& factory, // utki::span> stops, bool vertical ) @@ -79,12 +79,12 @@ utki::shared_ref gradient::make_vao( } // clang-format off - return rendering_context.make_vertex_array( + return factory.make_vertex_array( { - rendering_context.make_vertex_buffer(utki::make_span(vertices)), - rendering_context.make_vertex_buffer(utki::make_span(colors)) + factory.make_vertex_buffer(utki::make_span(vertices)), + factory.make_vertex_buffer(utki::make_span(colors)) }, - rendering_context.make_index_buffer(utki::make_span(indices)), + factory.make_index_buffer(utki::make_span(indices)), render::vertex_array::mode::triangle_strip ); // clang-format on diff --git a/src/ruis/res/gradient.hpp b/src/ruis/res/gradient.hpp index ba16e5996..6f360496e 100644 --- a/src/ruis/res/gradient.hpp +++ b/src/ruis/res/gradient.hpp @@ -62,7 +62,7 @@ class gradient : public resource utki::shared_ref vao; static utki::shared_ref make_vao( - const ruis::render::factory& rendering_context, // + const ruis::render::factory& factory, // utki::span> stops, bool vertical ); @@ -73,12 +73,12 @@ class gradient : public resource * A gradient stop is a pair of values. First one is a floating point value * from [0:1] defining the position of the gradient stop. The second value * defines the color of the stop. - * @param rendering_context - ruis rendering context. + * @param factory - ruis rendering context. * @param stops - gradient stops. * @param vertical - is gradient vertical (true) or horizontal (false). */ gradient( - const ruis::render::factory& rendering_context, // + const ruis::render::factory& factory, // utki::span> stops, bool vertical ); diff --git a/src/ruis/res/image.cpp b/src/ruis/res/image.cpp index 3b1bc0fd9..df21260ee 100644 --- a/src/ruis/res/image.cpp +++ b/src/ruis/res/image.cpp @@ -80,17 +80,17 @@ class res_raster_image : public image class res_svg_image : public image { public: - const utki::shared_ref rendering_context; + const utki::shared_ref factory; private: std::unique_ptr dom; public: res_svg_image( // - utki::shared_ref rendering_context, + utki::shared_ref factory, decltype(dom) dom ) : - rendering_context(std::move(rendering_context)), + factory(std::move(factory)), dom(std::move(dom)) {} @@ -157,7 +157,7 @@ class res_svg_image : public image auto dims = im.dims(); // clang-format off - auto tex_2d = this->rendering_context.get().make_texture_2d( + auto tex_2d = this->factory.get().make_texture_2d( std::move(im), { .min_filter = render::texture_2d::filter::nearest, diff --git a/src/ruis/res/nine_patch.cpp b/src/ruis/res/nine_patch.cpp index 4e5f5ad34..30b6e9d50 100644 --- a/src/ruis/res/nine_patch.cpp +++ b/src/ruis/res/nine_patch.cpp @@ -69,16 +69,16 @@ utki::shared_ref nine_patch::load( namespace { utki::shared_ref make_quad_vao( - const ruis::render::factory& rendering_context, // + const ruis::render::factory& factory, // const ruis::render::renderer::objects& common_rendering_objects, utki::span quad_tex_coords ) { - return rendering_context.make_vertex_array( + return factory.make_vertex_array( // clang-format off { common_rendering_objects.quad_01_vbo, - rendering_context.make_vertex_buffer(quad_tex_coords) + factory.make_vertex_buffer(quad_tex_coords) }, // clang-format on common_rendering_objects.quad_fan_indices, @@ -88,7 +88,7 @@ utki::shared_ref make_quad_vao( } // namespace nine_patch::nine_patch( - const ruis::render::factory& rendering_context, // + const ruis::render::factory& factory, // const ruis::render::renderer::objects& common_rendering_objects, utki::shared_ref image, sides fraction_borders @@ -96,19 +96,19 @@ nine_patch::nine_patch( // clang-format off vaos{{ { - make_quad_vao(rendering_context, common_rendering_objects, utki::span({ + make_quad_vao(factory, common_rendering_objects, utki::span({ vec2(0, 0), vec2(0, fraction_borders.top()), fraction_borders.left_top(), vec2(fraction_borders.left(), 0) })), - make_quad_vao(rendering_context, common_rendering_objects, utki::span({ + make_quad_vao(factory, common_rendering_objects, utki::span({ vec2(fraction_borders.left(), 0), fraction_borders.left_top(), vec2(real(1) - fraction_borders.right(), fraction_borders.top()), vec2(real(1) - fraction_borders.right(), 0) })), - make_quad_vao(rendering_context, common_rendering_objects, utki::span({ + make_quad_vao(factory, common_rendering_objects, utki::span({ vec2(real(1) - fraction_borders.right(), 0), vec2(real(1) - fraction_borders.right(), fraction_borders.top()), vec2(real(1), fraction_borders.top()), @@ -116,19 +116,19 @@ nine_patch::nine_patch( })) }, { - make_quad_vao(rendering_context, common_rendering_objects, utki::span({ + make_quad_vao(factory, common_rendering_objects, utki::span({ vec2(0, fraction_borders.top()), vec2(0, real(1) - fraction_borders.bottom()), vec2(fraction_borders.left(), real(1) - fraction_borders.bottom()), vec2(fraction_borders.left(), fraction_borders.top()), })), - make_quad_vao(rendering_context, common_rendering_objects, utki::span({ + make_quad_vao(factory, common_rendering_objects, utki::span({ fraction_borders.left_top(), vec2(fraction_borders.left(), real(1) - fraction_borders.bottom()), vec2(real(1) - fraction_borders.right(), real(1) - fraction_borders.bottom()), vec2(real(1) - fraction_borders.right(), fraction_borders.top()) })), - make_quad_vao(rendering_context, common_rendering_objects, utki::span({ + make_quad_vao(factory, common_rendering_objects, utki::span({ vec2(real(1) - fraction_borders.right(), fraction_borders.top()), vec2(real(1) - fraction_borders.right(), real(1) - fraction_borders.bottom()), vec2(real(1), real(1) - fraction_borders.bottom()), @@ -136,19 +136,19 @@ nine_patch::nine_patch( })) }, { - make_quad_vao(rendering_context, common_rendering_objects, utki::span({ + make_quad_vao(factory, common_rendering_objects, utki::span({ vec2(0, real(1) - fraction_borders.bottom()), vec2(0, real(1)), vec2(fraction_borders.left(), real(1)), vec2(fraction_borders.left(), real(1) - fraction_borders.bottom()), })), - make_quad_vao(rendering_context, common_rendering_objects, utki::span({ + make_quad_vao(factory, common_rendering_objects, utki::span({ vec2(fraction_borders.left(), real(1) - fraction_borders.bottom()), vec2(fraction_borders.left(), real(1)), vec2(real(1) - fraction_borders.right(), real(1)), vec2(real(1) - fraction_borders.right(), real(1) - fraction_borders.bottom()), })), - make_quad_vao(rendering_context, common_rendering_objects, utki::span({ + make_quad_vao(factory, common_rendering_objects, utki::span({ vec2(real(1) - fraction_borders.right(), real(1) - fraction_borders.bottom()), vec2(real(1) - fraction_borders.right(), real(1)), vec2(1, 1), diff --git a/src/ruis/res/nine_patch.hpp b/src/ruis/res/nine_patch.hpp index a86ab4386..26933bfbd 100644 --- a/src/ruis/res/nine_patch.hpp +++ b/src/ruis/res/nine_patch.hpp @@ -69,7 +69,7 @@ class nine_patch : public resource ~nine_patch() override = default; nine_patch( - const ruis::render::factory& rendering_context, + const ruis::render::factory& factory, const ruis::render::renderer::objects& common_rendering_objects, utki::shared_ref image, sides fraction_borders diff --git a/src/ruis/widget/widget.cpp b/src/ruis/widget/widget.cpp index fcd33ba39..2986aefae 100644 --- a/src/ruis/widget/widget.cpp +++ b/src/ruis/widget/widget.cpp @@ -273,12 +273,12 @@ utki::shared_ref widget::render_to_texture(std::shared_ptr } return r.rendering_context.get().make_framebuffer( - r.rendering_context.get().factory.get().make_texture_2d( // + r.rendering_context.get().fac().make_texture_2d( // rasterimage::format::rgba, dims, {} ), - this->is_depth_enabled() ? r.rendering_context.get().factory.get().make_texture_depth(dims) + this->is_depth_enabled() ? r.rendering_context.get().fac().make_texture_depth(dims) : std::shared_ptr(nullptr), nullptr ); diff --git a/tests/app1/src/cube_widget.cpp b/tests/app1/src/cube_widget.cpp index a2e7921a9..6721e71da 100644 --- a/tests/app1/src/cube_widget.cpp +++ b/tests/app1/src/cube_widget.cpp @@ -23,7 +23,7 @@ cube_widget::cube_widget( ruis::vec3(-1, -1, 1), ruis::vec3(-1, -1, 1), ruis::vec3(1, -1, -1), ruis::vec3(1, -1, 1)} }; - auto pos_vbo = this->context.get().renderer.get().rendering_context.get().factory.get().make_vertex_buffer( + auto pos_vbo = this->context.get().renderer.get().rendering_context.get().fac().make_vertex_buffer( utki::make_span(cube_pos) ); @@ -37,7 +37,7 @@ cube_widget::cube_widget( ruis::vec2(0, 0), ruis::vec2(1, 0), ruis::vec2(0, 1), ruis::vec2(1, 0), ruis::vec2(1, 1), ruis::vec2(0, 1)} }; - auto tex_vbo = this->context.get().renderer.get().rendering_context.get().factory.get().make_vertex_buffer( + auto tex_vbo = this->context.get().renderer.get().rendering_context.get().fac().make_vertex_buffer( utki::make_span(cube_tex) ); @@ -49,7 +49,7 @@ cube_widget::cube_widget( } }; - auto cube_indices = this->context.get().renderer.get().rendering_context.get().factory.get().make_index_buffer( + auto cube_indices = this->context.get().renderer.get().rendering_context.get().fac().make_index_buffer( utki::make_span(indices) ); @@ -57,7 +57,7 @@ cube_widget::cube_widget( this->context.get() .renderer.get() .rendering_context.get() - .factory.get() + .fac() .make_vertex_array({pos_vbo, tex_vbo}, cube_indices, ruis::render::vertex_array::mode::triangles) .to_shared_ptr(); diff --git a/tests/book/src/cube_page.cpp b/tests/book/src/cube_page.cpp index 3af9c9b62..387c9ddb0 100644 --- a/tests/book/src/cube_page.cpp +++ b/tests/book/src/cube_page.cpp @@ -43,7 +43,7 @@ class cube_widget : public ruis::widget, public ruis::updateable {-1, -1, -1}, {1, -1, -1}, {-1, -1, 1}, {-1, -1, 1}, {1, -1, -1}, {1, -1, 1}} }; - auto pos_vbo = this->context.get().renderer.get().rendering_context.get().factory.get().make_vertex_buffer( + auto pos_vbo = this->context.get().renderer.get().rendering_context.get().fac().make_vertex_buffer( utki::make_span(cube_pos) ); @@ -53,7 +53,7 @@ class cube_widget : public ruis::widget, public ruis::updateable {0, 0}, {1, 0}, {0, 1}, {1, 0}, {1, 1}, {0, 1}, {0, 0}, {1, 0}, {0, 1}, {1, 0}, {1, 1}, {0, 1}} }; - auto tex_vbo = this->context.get().renderer.get().rendering_context.get().factory.get().make_vertex_buffer( + auto tex_vbo = this->context.get().renderer.get().rendering_context.get().fac().make_vertex_buffer( utki::make_span(cube_tex) ); @@ -62,7 +62,7 @@ class cube_widget : public ruis::widget, public ruis::updateable 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35} }; - auto cube_indices = this->context.get().renderer.get().rendering_context.get().factory.get().make_index_buffer( + auto cube_indices = this->context.get().renderer.get().rendering_context.get().fac().make_index_buffer( utki::make_span(indices) ); @@ -70,7 +70,7 @@ class cube_widget : public ruis::widget, public ruis::updateable this->context.get() .renderer.get() .rendering_context.get() - .factory.get() + .fac() .make_vertex_array({pos_vbo, tex_vbo}, cube_indices, ruis::render::vertex_array::mode::triangles) .to_shared_ptr(); diff --git a/tests/harness/modules/ruisapp b/tests/harness/modules/ruisapp index 611f403ec..622b89adc 160000 --- a/tests/harness/modules/ruisapp +++ b/tests/harness/modules/ruisapp @@ -1 +1 @@ -Subproject commit 611f403ec6d28744be9a8c82f45eabb7e7fce4b6 +Subproject commit 622b89adc83803fc718abc1c9789bd30040ba838 From 480b2df097833dcc35115ec57b63898152844517 Mon Sep 17 00:00:00 2001 From: Ivan Gagis Date: Thu, 19 Nov 2026 15:07:50 +0200 Subject: [PATCH 06/11] format --- src/ruis/render/renderer.cpp | 8 +++----- tests/app1/src/cube_widget.cpp | 15 ++++++--------- tests/book/src/cube_page.cpp | 18 +++++++++--------- 3 files changed, 18 insertions(+), 23 deletions(-) diff --git a/src/ruis/render/renderer.cpp b/src/ruis/render/renderer.cpp index 99b5cec00..18f8bb57b 100644 --- a/src/ruis/render/renderer.cpp +++ b/src/ruis/render/renderer.cpp @@ -50,11 +50,9 @@ renderer::objects::objects(const ruis::render::factory& factory) : vec2(1, 0) }))), quad_fan_indices(factory.make_index_buffer(utki::make_span(std::array{0, 1, 2, 3}))), - pos_quad_01_vao(factory.make_vertex_array( - {this->quad_01_vbo}, - this->quad_fan_indices, - vertex_array::mode::triangle_fan - )), + pos_quad_01_vao( + factory.make_vertex_array({this->quad_01_vbo}, this->quad_fan_indices, vertex_array::mode::triangle_fan) + ), pos_tex_quad_01_vao(factory.make_vertex_array( {this->quad_01_vbo, this->quad_01_vbo}, this->quad_fan_indices, diff --git a/tests/app1/src/cube_widget.cpp b/tests/app1/src/cube_widget.cpp index 6721e71da..0870cb823 100644 --- a/tests/app1/src/cube_widget.cpp +++ b/tests/app1/src/cube_widget.cpp @@ -23,9 +23,8 @@ cube_widget::cube_widget( ruis::vec3(-1, -1, 1), ruis::vec3(-1, -1, 1), ruis::vec3(1, -1, -1), ruis::vec3(1, -1, 1)} }; - auto pos_vbo = this->context.get().renderer.get().rendering_context.get().fac().make_vertex_buffer( - utki::make_span(cube_pos) - ); + auto pos_vbo = + this->context.get().renderer.get().rendering_context.get().fac().make_vertex_buffer(utki::make_span(cube_pos)); // NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers) std::array cube_tex = { @@ -37,9 +36,8 @@ cube_widget::cube_widget( ruis::vec2(0, 0), ruis::vec2(1, 0), ruis::vec2(0, 1), ruis::vec2(1, 0), ruis::vec2(1, 1), ruis::vec2(0, 1)} }; - auto tex_vbo = this->context.get().renderer.get().rendering_context.get().fac().make_vertex_buffer( - utki::make_span(cube_tex) - ); + auto tex_vbo = + this->context.get().renderer.get().rendering_context.get().fac().make_vertex_buffer(utki::make_span(cube_tex)); // NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers) std::array indices = { @@ -49,9 +47,8 @@ cube_widget::cube_widget( } }; - auto cube_indices = this->context.get().renderer.get().rendering_context.get().fac().make_index_buffer( - utki::make_span(indices) - ); + auto cube_indices = + this->context.get().renderer.get().rendering_context.get().fac().make_index_buffer(utki::make_span(indices)); this->cubeVAO = this->context.get() diff --git a/tests/book/src/cube_page.cpp b/tests/book/src/cube_page.cpp index 387c9ddb0..a8268c5d2 100644 --- a/tests/book/src/cube_page.cpp +++ b/tests/book/src/cube_page.cpp @@ -43,9 +43,9 @@ class cube_widget : public ruis::widget, public ruis::updateable {-1, -1, -1}, {1, -1, -1}, {-1, -1, 1}, {-1, -1, 1}, {1, -1, -1}, {1, -1, 1}} }; - auto pos_vbo = this->context.get().renderer.get().rendering_context.get().fac().make_vertex_buffer( - utki::make_span(cube_pos) - ); + auto pos_vbo = + this->context.get().renderer.get().rendering_context.get().fac().make_vertex_buffer(utki::make_span(cube_pos + )); std::array cube_tex = { {{0, 0}, {1, 0}, {0, 1}, {1, 0}, {1, 1}, {0, 1}, {0, 0}, {1, 0}, {0, 1}, {1, 0}, {1, 1}, {0, 1}, @@ -53,18 +53,18 @@ class cube_widget : public ruis::widget, public ruis::updateable {0, 0}, {1, 0}, {0, 1}, {1, 0}, {1, 1}, {0, 1}, {0, 0}, {1, 0}, {0, 1}, {1, 0}, {1, 1}, {0, 1}} }; - auto tex_vbo = this->context.get().renderer.get().rendering_context.get().fac().make_vertex_buffer( - utki::make_span(cube_tex) - ); + auto tex_vbo = + this->context.get().renderer.get().rendering_context.get().fac().make_vertex_buffer(utki::make_span(cube_tex + )); std::array indices = { {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35} }; - auto cube_indices = this->context.get().renderer.get().rendering_context.get().fac().make_index_buffer( - utki::make_span(indices) - ); + auto cube_indices = + this->context.get().renderer.get().rendering_context.get().fac().make_index_buffer(utki::make_span(indices) + ); this->cube_vao = this->context.get() From 38a2bf265693518e6258b4355fe5449a9009020f Mon Sep 17 00:00:00 2001 From: Ivan Gagis Date: Thu, 19 Nov 2026 15:08:06 +0200 Subject: [PATCH 07/11] bump ruisapp submodule (format) --- tests/harness/modules/ruisapp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/harness/modules/ruisapp b/tests/harness/modules/ruisapp index 622b89adc..594877bb8 160000 --- a/tests/harness/modules/ruisapp +++ b/tests/harness/modules/ruisapp @@ -1 +1 @@ -Subproject commit 622b89adc83803fc718abc1c9789bd30040ba838 +Subproject commit 594877bb8054d02eeb92aef67df5a22d016841e8 From e8fce74f80ce4873e409a57a45c3bce4ce794d33 Mon Sep 17 00:00:00 2001 From: Ivan Gagis Date: Thu, 19 Nov 2026 15:20:17 +0200 Subject: [PATCH 08/11] context: keep the factory member public; fac() is a shorthand for it The render factory stays a public member of the context (as before). fac() is just a shorthand that returns a const reference to it, for the common context.fac().make_*() call sites. --- src/ruis/render/context.cpp | 2 +- src/ruis/render/context.hpp | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/ruis/render/context.cpp b/src/ruis/render/context.cpp index 36b411649..e93fa617f 100644 --- a/src/ruis/render/context.cpp +++ b/src/ruis/render/context.cpp @@ -30,8 +30,8 @@ context::context( utki::shared_ref factory, // parameters params ) : - factory_ref(std::move(factory)), native_window(std::move(native_window)), + factory(std::move(factory)), initial_matrix(std::move(params.initial_matrix)) { // insert this context to the bottom of the current contexts stack diff --git a/src/ruis/render/context.hpp b/src/ruis/render/context.hpp index e61f5d958..b4488145c 100644 --- a/src/ruis/render/context.hpp +++ b/src/ruis/render/context.hpp @@ -51,7 +51,6 @@ class context : public std::enable_shared_from_this private: std::weak_ptr cur_fb; - const utki::shared_ref factory_ref; public: /** @@ -68,15 +67,20 @@ class context : public std::enable_shared_from_this const utki::shared_ref native_window; /** - * @brief Get the render factory injected into this context. + * @brief The render factory injected into this context. * All shareable render objects (textures, buffers, vertex arrays, shaders) are * created by the factory and hold a reference to it, so they can be used by any * render context in the process. This context is only for state control and for * creating per-window frame buffers. */ - const factory& fac() const noexcept + const utki::shared_ref factory; + + /** + * @brief Shorthand for getting a reference to the factory. + */ + const ruis::render::factory& fac() const noexcept { - return this->factory_ref.get(); + return this->factory.get(); } struct parameters { From d01a0f6bb4d20b7a4b5943e882fb3dbb4ac2c4b6 Mon Sep 17 00:00:00 2001 From: Ivan Gagis Date: Thu, 19 Nov 2026 15:48:34 +0200 Subject: [PATCH 09/11] review fixes: VAO ctx->factory rename, fac() shorthands, renderer ctx() - rectangle_vao: rename the factory-typed 'ctx' params/vars to 'factory' - context::fac(): drop the explicit .get() (shared_ref auto-casts to ref) - resource_loader: add a fac() shorthand; use it in the res/* loaders - widget/gradient/texture_font: use the renderer's ctx() instead of poking at the rendering_context member directly --- src/ruis/font/texture_font.cpp | 2 +- src/ruis/paint/rectangle_vao.cpp | 20 ++++++------ src/ruis/render/context.hpp | 2 +- src/ruis/res/image.cpp | 2 +- src/ruis/res/texture_2d.cpp | 2 +- src/ruis/res/texture_cube.cpp | 2 +- src/ruis/resource_loader.hpp | 8 +++++ src/ruis/widget/label/gradient.cpp | 2 +- src/ruis/widget/widget.cpp | 50 +++++++++++++++--------------- 9 files changed, 49 insertions(+), 41 deletions(-) diff --git a/src/ruis/font/texture_font.cpp b/src/ruis/font/texture_font.cpp index 3315c7c31..f162547a8 100644 --- a/src/ruis/font/texture_font.cpp +++ b/src/ruis/font/texture_font.cpp @@ -358,7 +358,7 @@ font::render_result texture_font::render_internal( return ret; } - renderer.rendering_context.get().set_simple_alpha_blending(); + renderer.ctx().set_simple_alpha_blending(); ruis::mat4 matr(matrix); diff --git a/src/ruis/paint/rectangle_vao.cpp b/src/ruis/paint/rectangle_vao.cpp index b019aa2ae..d7a46dc28 100644 --- a/src/ruis/paint/rectangle_vao.cpp +++ b/src/ruis/paint/rectangle_vao.cpp @@ -393,7 +393,7 @@ auto make_rounded_corners_texture_image(const rectangle_vao::parameters& params) } utki::shared_ref make_quad_vao( - const ruis::render::factory& ctx, // + const ruis::render::factory& factory, // const ruis::render::renderer::objects& objects, // const r4::segment2& tex_coords ) @@ -405,11 +405,11 @@ utki::shared_ref make_quad_vao( tex_coords.x2_y1() }; - return ctx.make_vertex_array( + return factory.make_vertex_array( // clang-format off { objects.quad_01_vbo, - ctx.make_vertex_buffer(tex_coords_array) + factory.make_vertex_buffer(tex_coords_array) }, // clang-format on objects.quad_fan_indices, @@ -418,7 +418,7 @@ utki::shared_ref make_quad_vao( } std::array, 2>, 2> make_corner_vaos( - const ruis::render::factory& ctx, // + const ruis::render::factory& factory, // const ruis::render::renderer::objects& objects, // const ruis::vec2& tex_dims, const ruis::corners& radii @@ -434,14 +434,14 @@ std::array, 2>, 2> return {{ { // left-top - make_quad_vao(ctx, objects, + make_quad_vao(factory, objects, { .p1 = {0, 0}, .p2 = {radii.left_top() / tw, radii.left_top() / th} } ), // right-top - make_quad_vao(ctx, objects, + make_quad_vao(factory, objects, { .p1 = {1 - radii.right_top() / tw, 0}, .p2 = {1, radii.right_top() / th} @@ -450,14 +450,14 @@ std::array, 2>, 2> }, { // left-bottom - make_quad_vao(ctx, objects, + make_quad_vao(factory, objects, { .p1 = {0, 1 - radii.left_bottom() / th}, .p2 = {radii.left_bottom() / tw, 1} } ), // right-bottom - make_quad_vao(ctx, objects, + make_quad_vao(factory, objects, { .p1 = {1 - radii.right_bottom() / tw, 1 - radii.right_bottom() / th}, .p2 = {1, 1} @@ -471,7 +471,7 @@ std::array, 2>, 2> } // namespace rectangle_vao::rounded_corners_texture::rounded_corners_texture( - const ruis::render::factory& ctx, // + const ruis::render::factory& factory, // const ruis::render::renderer::objects& objects, // utki::shared_ref tex, corners radii @@ -479,7 +479,7 @@ rectangle_vao::rounded_corners_texture::rounded_corners_texture( tex(std::move(tex)), radii(std::move(radii)), vaos(make_corner_vaos( - ctx, // + factory, // objects, // this->tex.get().dims().to(), this->radii diff --git a/src/ruis/render/context.hpp b/src/ruis/render/context.hpp index b4488145c..9620f4a11 100644 --- a/src/ruis/render/context.hpp +++ b/src/ruis/render/context.hpp @@ -80,7 +80,7 @@ class context : public std::enable_shared_from_this */ const ruis::render::factory& fac() const noexcept { - return this->factory.get(); + return this->factory; } struct parameters { diff --git a/src/ruis/res/image.cpp b/src/ruis/res/image.cpp index df21260ee..d994a96ee 100644 --- a/src/ruis/res/image.cpp +++ b/src/ruis/res/image.cpp @@ -68,7 +68,7 @@ class res_raster_image : public image const fsif::file& fi ) { - return utki::make_shared(loader.factory.get().make_texture_2d( + return utki::make_shared(loader.fac().make_texture_2d( rasterimage::read(fi), { // TODO: what about params? diff --git a/src/ruis/res/texture_2d.cpp b/src/ruis/res/texture_2d.cpp index e7127ae08..6a0cd0832 100644 --- a/src/ruis/res/texture_2d.cpp +++ b/src/ruis/res/texture_2d.cpp @@ -87,7 +87,7 @@ utki::shared_ref texture_2d::load( } } - auto tex = loader.factory.get().make_texture_2d( // + auto tex = loader.fac().make_texture_2d( // rasterimage::read(fi), std::move(params) ); diff --git a/src/ruis/res/texture_cube.cpp b/src/ruis/res/texture_cube.cpp index 4b1f949cf..198f61b9b 100644 --- a/src/ruis/res/texture_cube.cpp +++ b/src/ruis/res/texture_cube.cpp @@ -81,7 +81,7 @@ utki::shared_ref texture_cube::load( } } - auto tex = loader.factory.get().make_texture_cube( // + auto tex = loader.fac().make_texture_cube( // rasterimage::read(fi.set_path(check_not_empty(file_px, file_px_param))), rasterimage::read(fi.set_path(check_not_empty(file_nx, file_nx_param))), rasterimage::read(fi.set_path(check_not_empty(file_py, file_py_param))), diff --git a/src/ruis/resource_loader.hpp b/src/ruis/resource_loader.hpp index 9eee830db..486296f08 100644 --- a/src/ruis/resource_loader.hpp +++ b/src/ruis/resource_loader.hpp @@ -69,6 +69,14 @@ class resource_loader public: const utki::shared_ref factory; + /** + * @brief Shorthand for getting a reference to the factory. + */ + const ruis::render::factory& fac() const noexcept + { + return this->factory; + } + const utki::shared_ref common_rendering_objects; private: diff --git a/src/ruis/widget/label/gradient.cpp b/src/ruis/widget/label/gradient.cpp index 7d136d6bf..5c2d8707a 100644 --- a/src/ruis/widget/label/gradient.cpp +++ b/src/ruis/widget/label/gradient.cpp @@ -40,7 +40,7 @@ gradient::gradient( // void gradient::render(const mat4& matrix) const { - this->context.get().renderer.get().rendering_context.get().set_simple_alpha_blending(); + this->context.get().renderer.get().ctx().set_simple_alpha_blending(); ruis::mat4 matr(matrix); matr.scale(this->rect().d); diff --git a/src/ruis/widget/widget.cpp b/src/ruis/widget/widget.cpp index 2986aefae..05b1a2dde 100644 --- a/src/ruis/widget/widget.cpp +++ b/src/ruis/widget/widget.cpp @@ -194,11 +194,11 @@ void widget::render_internal(const ruis::mat4& matrix) const if (this->is_cache_enabled()) { if (this->cache_dirty) { utki::scope_exit scissor_test_enabled_scope_exit( - [&r, scissor_test_was_enabled = r.rendering_context.get().is_scissor_enabled()]() { - r.rendering_context.get().enable_scissor(scissor_test_was_enabled); + [&r, scissor_test_was_enabled = r.ctx().is_scissor_enabled()]() { + r.ctx().enable_scissor(scissor_test_was_enabled); } ); - r.rendering_context.get().enable_scissor(false); + r.ctx().enable_scissor(false); this->cache_frame_buffer = this->render_to_texture(std::move(this->cache_frame_buffer)).to_shared_ptr(); @@ -206,41 +206,41 @@ void widget::render_internal(const ruis::mat4& matrix) const } // after rendering to texture it is most likely there will be transparent areas, so enable simple blending - this->context.get().renderer.get().rendering_context.get().set_simple_alpha_blending(); + this->context.get().renderer.get().ctx().set_simple_alpha_blending(); this->render_from_cache(matrix); } else { if (this->is_depth_enabled()) { - r.rendering_context.get().enable_depth(true); - r.rendering_context.get().clear_framebuffer_depth(); + r.ctx().enable_depth(true); + r.ctx().clear_framebuffer_depth(); } if (this->is_clip_enabled()) { r4::rectangle scissor = this->compute_viewport_rect(matrix); r4::rectangle old_scissor{}; - bool scissor_test_was_enabled = r.rendering_context.get().is_scissor_enabled(); + bool scissor_test_was_enabled = r.ctx().is_scissor_enabled(); if (scissor_test_was_enabled) { - old_scissor = r.rendering_context.get().get_scissor(); + old_scissor = r.ctx().get_scissor(); scissor.intersect(old_scissor); } else { - r.rendering_context.get().enable_scissor(true); + r.ctx().enable_scissor(true); } - r.rendering_context.get().set_scissor(scissor); + r.ctx().set_scissor(scissor); this->render(matrix); if (scissor_test_was_enabled) { - r.rendering_context.get().set_scissor(old_scissor); + r.ctx().set_scissor(old_scissor); } else { - r.rendering_context.get().enable_scissor(false); + r.ctx().enable_scissor(false); } } else { this->render(matrix); } - r.rendering_context.get().enable_depth(false); + r.ctx().enable_depth(false); } // render border @@ -272,31 +272,31 @@ utki::shared_ref widget::render_to_texture(std::shared_ptr return utki::shared_ref(std::move(reuse)); } - return r.rendering_context.get().make_framebuffer( - r.rendering_context.get().fac().make_texture_2d( // + return r.ctx().make_framebuffer( + r.ctx().fac().make_texture_2d( // rasterimage::format::rgba, dims, {} ), - this->is_depth_enabled() ? r.rendering_context.get().fac().make_texture_depth(dims) + this->is_depth_enabled() ? r.ctx().fac().make_texture_depth(dims) : std::shared_ptr(nullptr), nullptr ); }(); fb.get().apply([&]() { - r.rendering_context.get().clear_framebuffer_color(); + r.ctx().clear_framebuffer_color(); - utki::scope_exit depth_scope_exit([old_depth = r.rendering_context.get().is_depth_enabled(), &r]() { - r.rendering_context.get().enable_depth(old_depth); + utki::scope_exit depth_scope_exit([old_depth = r.ctx().is_depth_enabled(), &r]() { + r.ctx().enable_depth(old_depth); }); - r.rendering_context.get().enable_depth(this->is_depth_enabled()); + r.ctx().enable_depth(this->is_depth_enabled()); if (this->is_depth_enabled()) { - r.rendering_context.get().clear_framebuffer_depth(); + r.ctx().clear_framebuffer_depth(); } - this->render(make_viewport_matrix(r.rendering_context.get().initial_matrix, this->rect().d)); + this->render(make_viewport_matrix(r.ctx().initial_matrix, this->rect().d)); }); return fb; @@ -373,9 +373,9 @@ r4::rectangle widget::compute_viewport_rect(const mat4& matrix) const { return { { - .p1 = this->context.get().renderer.get().rendering_context.get().to_window_coords(matrix * vec2(0, 0)), + .p1 = this->context.get().renderer.get().ctx().to_window_coords(matrix * vec2(0, 0)), .p2 = - this->context.get().renderer.get().rendering_context.get().to_window_coords(matrix * this->rect().d) // + this->context.get().renderer.get().ctx().to_window_coords(matrix * this->rect().d) // } }; } @@ -657,7 +657,7 @@ widget::probe_response_set widget::probe(const tml::tree& command) // work is wrapped in rendering_context::apply(), which makes the context current and // restores the previous one afterwards. rasterimage::image_variant imvar; - this->context.get().renderer.get().rendering_context.get().apply([&]() { + this->context.get().renderer.get().ctx().apply([&]() { imvar = this->render_to_texture().get().get_color_pixels(); }); From 2c59f864233aa3f160d610c7d8cd45b308a603c2 Mon Sep 17 00:00:00 2001 From: Ivan Gagis Date: Thu, 19 Nov 2026 16:22:30 +0200 Subject: [PATCH 10/11] Address PR review: use this->ctx().ren().ctx().fac() shortcut Replace the verbose context.get().renderer.get().ctx().fac() chains with the this->ctx().ren().ctx().fac() shortcut, and shorten other long chains in widget.cpp to r.ctx()/this->ctx().ren().ctx(). --- src/ruis/widget/widget.cpp | 9 ++++----- tests/app1/src/cube_widget.cpp | 15 ++++++--------- tests/book/src/cube_page.cpp | 12 +++--------- 3 files changed, 13 insertions(+), 23 deletions(-) diff --git a/src/ruis/widget/widget.cpp b/src/ruis/widget/widget.cpp index 05b1a2dde..c0ca3d6e4 100644 --- a/src/ruis/widget/widget.cpp +++ b/src/ruis/widget/widget.cpp @@ -206,7 +206,7 @@ void widget::render_internal(const ruis::mat4& matrix) const } // after rendering to texture it is most likely there will be transparent areas, so enable simple blending - this->context.get().renderer.get().ctx().set_simple_alpha_blending(); + r.ctx().set_simple_alpha_blending(); this->render_from_cache(matrix); } else { @@ -373,9 +373,8 @@ r4::rectangle widget::compute_viewport_rect(const mat4& matrix) const { return { { - .p1 = this->context.get().renderer.get().ctx().to_window_coords(matrix * vec2(0, 0)), - .p2 = - this->context.get().renderer.get().ctx().to_window_coords(matrix * this->rect().d) // + .p1 = this->ctx().ren().ctx().to_window_coords(matrix * vec2(0, 0)), + .p2 = this->ctx().ren().ctx().to_window_coords(matrix * this->rect().d) // } }; } @@ -657,7 +656,7 @@ widget::probe_response_set widget::probe(const tml::tree& command) // work is wrapped in rendering_context::apply(), which makes the context current and // restores the previous one afterwards. rasterimage::image_variant imvar; - this->context.get().renderer.get().ctx().apply([&]() { + this->ctx().ren().ctx().apply([&]() { imvar = this->render_to_texture().get().get_color_pixels(); }); diff --git a/tests/app1/src/cube_widget.cpp b/tests/app1/src/cube_widget.cpp index 0870cb823..6f9c76f6f 100644 --- a/tests/app1/src/cube_widget.cpp +++ b/tests/app1/src/cube_widget.cpp @@ -23,8 +23,7 @@ cube_widget::cube_widget( ruis::vec3(-1, -1, 1), ruis::vec3(-1, -1, 1), ruis::vec3(1, -1, -1), ruis::vec3(1, -1, 1)} }; - auto pos_vbo = - this->context.get().renderer.get().rendering_context.get().fac().make_vertex_buffer(utki::make_span(cube_pos)); + auto pos_vbo = this->ctx().ren().ctx().fac().make_vertex_buffer(utki::make_span(cube_pos)); // NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers) std::array cube_tex = { @@ -36,8 +35,7 @@ cube_widget::cube_widget( ruis::vec2(0, 0), ruis::vec2(1, 0), ruis::vec2(0, 1), ruis::vec2(1, 0), ruis::vec2(1, 1), ruis::vec2(0, 1)} }; - auto tex_vbo = - this->context.get().renderer.get().rendering_context.get().fac().make_vertex_buffer(utki::make_span(cube_tex)); + auto tex_vbo = this->ctx().ren().ctx().fac().make_vertex_buffer(utki::make_span(cube_tex)); // NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers) std::array indices = { @@ -47,13 +45,12 @@ cube_widget::cube_widget( } }; - auto cube_indices = - this->context.get().renderer.get().rendering_context.get().fac().make_index_buffer(utki::make_span(indices)); + auto cube_indices = this->ctx().ren().ctx().fac().make_index_buffer(utki::make_span(indices)); this->cubeVAO = - this->context.get() - .renderer.get() - .rendering_context.get() + this->ctx() + .ren() + .ctx() .fac() .make_vertex_array({pos_vbo, tex_vbo}, cube_indices, ruis::render::vertex_array::mode::triangles) .to_shared_ptr(); diff --git a/tests/book/src/cube_page.cpp b/tests/book/src/cube_page.cpp index a8268c5d2..64e47711f 100644 --- a/tests/book/src/cube_page.cpp +++ b/tests/book/src/cube_page.cpp @@ -43,9 +43,7 @@ class cube_widget : public ruis::widget, public ruis::updateable {-1, -1, -1}, {1, -1, -1}, {-1, -1, 1}, {-1, -1, 1}, {1, -1, -1}, {1, -1, 1}} }; - auto pos_vbo = - this->context.get().renderer.get().rendering_context.get().fac().make_vertex_buffer(utki::make_span(cube_pos - )); + auto pos_vbo = this->ctx().ren().ctx().fac().make_vertex_buffer(utki::make_span(cube_pos)); std::array cube_tex = { {{0, 0}, {1, 0}, {0, 1}, {1, 0}, {1, 1}, {0, 1}, {0, 0}, {1, 0}, {0, 1}, {1, 0}, {1, 1}, {0, 1}, @@ -53,18 +51,14 @@ class cube_widget : public ruis::widget, public ruis::updateable {0, 0}, {1, 0}, {0, 1}, {1, 0}, {1, 1}, {0, 1}, {0, 0}, {1, 0}, {0, 1}, {1, 0}, {1, 1}, {0, 1}} }; - auto tex_vbo = - this->context.get().renderer.get().rendering_context.get().fac().make_vertex_buffer(utki::make_span(cube_tex - )); + auto tex_vbo = this->ctx().ren().ctx().fac().make_vertex_buffer(utki::make_span(cube_tex)); std::array indices = { {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35} }; - auto cube_indices = - this->context.get().renderer.get().rendering_context.get().fac().make_index_buffer(utki::make_span(indices) - ); + auto cube_indices = this->ctx().ren().ctx().fac().make_index_buffer(utki::make_span(indices)); this->cube_vao = this->context.get() From f0a2fecb7525dcea1861189f69c4eebfaa1eebf1 Mon Sep 17 00:00:00 2001 From: Ivan Gagis Date: Thu, 19 Nov 2026 16:52:26 +0200 Subject: [PATCH 11/11] Add dummy factory.cpp so the header is linted factory.hpp is a header-only class with no corresponding source file. Add a dummy factory.cpp that just includes the header so the header is compiled and linted during the lint preset build (per the add-new-source-file convention). --- src/ruis/render/factory.cpp | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 src/ruis/render/factory.cpp diff --git a/src/ruis/render/factory.cpp b/src/ruis/render/factory.cpp new file mode 100644 index 000000000..a1e4b2f75 --- /dev/null +++ b/src/ruis/render/factory.cpp @@ -0,0 +1,24 @@ +/* +ruis - GUI framework + +Copyright (C) 2012-2026 Ivan Gagis + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +/* ================ LICENSE END ================ */ + +#include "factory.hpp" + +// this is a dummy file to test the header file compilation and linting