Skip to content

Commit 6ca91a5

Browse files
igagisigagis
committed
stuff
1 parent 9a0313d commit 6ca91a5

14 files changed

+58
-49
lines changed

‎src/ruis/render/null/context.cpp

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@ utki::shared_ref<ruis::render::frame_buffer> context::make_framebuffer(
4545
);
4646
}
4747

48-
utki::shared_ref<ruis::render::index_buffer> context::make_index_buffer(utki::span<const uint16_t> indices)
48+
utki::shared_ref<ruis::render::index_buffer> context::make_index_buffer(utki::span<const uint16_t> indices) const
4949
{
5050
return utki::make_shared<index_buffer>(
5151
this->get_shared_ref(), //
5252
indices
5353
);
5454
}
5555

56-
utki::shared_ref<ruis::render::index_buffer> context::make_index_buffer(utki::span<const uint32_t> indices)
56+
utki::shared_ref<ruis::render::index_buffer> context::make_index_buffer(utki::span<const uint32_t> indices) const
5757
{
5858
return utki::make_shared<index_buffer>(
5959
this->get_shared_ref(), //
@@ -65,7 +65,7 @@ utki::shared_ref<ruis::render::texture_2d> context::make_texture_2d(
6565
rasterimage::format format,
6666
rasterimage::dimensioned::dimensions_type dims,
6767
texture_2d_parameters params
68-
)
68+
) const
6969
{
7070
return utki::make_shared<texture_2d>(
7171
this->get_shared_ref(), //
@@ -77,7 +77,7 @@ utki::shared_ref<ruis::render::texture_2d> context::make_texture_2d(
7777
utki::shared_ref<ruis::render::texture_2d> context::make_texture_2d(
7878
const rasterimage::image_variant& imvar,
7979
texture_2d_parameters params
80-
)
80+
) const
8181
{
8282
return utki::make_shared<texture_2d>(
8383
this->get_shared_ref(), //
@@ -89,7 +89,7 @@ utki::shared_ref<ruis::render::texture_2d> context::make_texture_2d(
8989
utki::shared_ref<ruis::render::texture_2d> context::make_texture_2d(
9090
rasterimage::image_variant&& imvar,
9191
texture_2d_parameters params
92-
)
92+
) const
9393
{
9494
return utki::make_shared<texture_2d>(
9595
this->get_shared_ref(), //
@@ -98,7 +98,7 @@ utki::shared_ref<ruis::render::texture_2d> context::make_texture_2d(
9898
);
9999
}
100100

101-
utki::shared_ref<ruis::render::texture_depth> context::make_texture_depth(r4::vector2<uint32_t> dims)
101+
utki::shared_ref<ruis::render::texture_depth> context::make_texture_depth(r4::vector2<uint32_t> dims) const
102102
{
103103
return utki::make_shared<texture_depth>(
104104
this->get_shared_ref(), //
@@ -113,7 +113,7 @@ utki::shared_ref<ruis::render::texture_cube> context::make_texture_cube(
113113
rasterimage::image_variant&& negative_y,
114114
rasterimage::image_variant&& positive_z,
115115
rasterimage::image_variant&& negative_z
116-
)
116+
) const
117117
{
118118
return utki::make_shared<texture_cube>(
119119
this->get_shared_ref(), //
@@ -130,7 +130,7 @@ utki::shared_ref<ruis::render::vertex_array> context::make_vertex_array(
130130
std::vector<utki::shared_ref<const ruis::render::vertex_buffer>> buffers,
131131
utki::shared_ref<const ruis::render::index_buffer> indices,
132132
ruis::render::vertex_array::mode rendering_mode
133-
)
133+
) const
134134
{
135135
return utki::make_shared<vertex_array>(
136136
this->get_shared_ref(), //
@@ -140,31 +140,37 @@ utki::shared_ref<ruis::render::vertex_array> context::make_vertex_array(
140140
);
141141
}
142142

143-
utki::shared_ref<ruis::render::vertex_buffer> context::make_vertex_buffer(utki::span<const float> vertices)
143+
utki::shared_ref<ruis::render::vertex_buffer> context::make_vertex_buffer(utki::span<const float> vertices) const
144144
{
145145
return utki::make_shared<vertex_buffer>(
146146
this->get_shared_ref(), //
147147
vertices
148148
);
149149
}
150150

151-
utki::shared_ref<ruis::render::vertex_buffer> context::make_vertex_buffer(utki::span<const r4::vector2<float>> vertices)
151+
utki::shared_ref<ruis::render::vertex_buffer> context::make_vertex_buffer( //
152+
utki::span<const r4::vector2<float>> vertices
153+
) const
152154
{
153155
return utki::make_shared<vertex_buffer>(
154156
this->get_shared_ref(), //
155157
vertices
156158
);
157159
}
158160

159-
utki::shared_ref<ruis::render::vertex_buffer> context::make_vertex_buffer(utki::span<const r4::vector3<float>> vertices)
161+
utki::shared_ref<ruis::render::vertex_buffer> context::make_vertex_buffer( //
162+
utki::span<const r4::vector3<float>> vertices
163+
) const
160164
{
161165
return utki::make_shared<vertex_buffer>(
162166
this->get_shared_ref(), //
163167
vertices
164168
);
165169
}
166170

167-
utki::shared_ref<ruis::render::vertex_buffer> context::make_vertex_buffer(utki::span<const r4::vector4<float>> vertices)
171+
utki::shared_ref<ruis::render::vertex_buffer> context::make_vertex_buffer( //
172+
utki::span<const r4::vector4<float>> vertices
173+
) const
168174
{
169175
return utki::make_shared<vertex_buffer>(
170176
this->get_shared_ref(), //

‎src/ruis/render/null/context.hpp

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,16 @@ class context : public ruis::render::context
2929
{
3030
public:
3131
context() :
32-
ruis::render::context(parameters())
32+
ruis::render::context(
33+
utki::make_shared<ruis::render::native_window>(), //
34+
parameters()
35+
)
3336
{}
3437

3538
// ===============================
3639
// ====== factory functions ======
3740

38-
utki::shared_ref<ruis::render::context::shaders> make_shaders() override
41+
utki::shared_ref<ruis::render::context::shaders> make_shaders() const override
3942
{
4043
return utki::make_shared<ruis::render::context::shaders>();
4144
}
@@ -46,26 +49,26 @@ class context : public ruis::render::context
4649
std::shared_ptr<ruis::render::texture_stencil> stencil
4750
) override;
4851

49-
utki::shared_ref<ruis::render::index_buffer> make_index_buffer(utki::span<const uint16_t> indices) override;
50-
utki::shared_ref<ruis::render::index_buffer> make_index_buffer(utki::span<const uint32_t> indices) override;
52+
utki::shared_ref<ruis::render::index_buffer> make_index_buffer(utki::span<const uint16_t> indices) const override;
53+
utki::shared_ref<ruis::render::index_buffer> make_index_buffer(utki::span<const uint32_t> indices) const override;
5154

5255
utki::shared_ref<ruis::render::texture_2d> make_texture_2d(
5356
rasterimage::format format,
5457
rasterimage::dimensioned::dimensions_type dims,
5558
texture_2d_parameters params
56-
) override;
59+
) const override;
5760

5861
utki::shared_ref<ruis::render::texture_2d> make_texture_2d(
5962
const rasterimage::image_variant& imvar,
6063
texture_2d_parameters params
61-
) override;
64+
) const override;
6265

6366
utki::shared_ref<ruis::render::texture_2d> make_texture_2d(
6467
rasterimage::image_variant&& imvar,
6568
texture_2d_parameters params
66-
) override;
69+
) const override;
6770

68-
utki::shared_ref<ruis::render::texture_depth> make_texture_depth(r4::vector2<uint32_t> dims) override;
71+
utki::shared_ref<ruis::render::texture_depth> make_texture_depth(r4::vector2<uint32_t> dims) const override;
6972

7073
utki::shared_ref<ruis::render::texture_cube> make_texture_cube(
7174
rasterimage::image_variant&& positive_x,
@@ -74,29 +77,29 @@ class context : public ruis::render::context
7477
rasterimage::image_variant&& negative_y,
7578
rasterimage::image_variant&& positive_z,
7679
rasterimage::image_variant&& negative_z
77-
) override;
80+
) const override;
7881

7982
utki::shared_ref<ruis::render::vertex_array> make_vertex_array(
8083
std::vector<utki::shared_ref<const ruis::render::vertex_buffer>> buffers,
8184
utki::shared_ref<const ruis::render::index_buffer> indices,
8285
ruis::render::vertex_array::mode rendering_mode
83-
) override;
86+
) const override;
8487

8588
utki::shared_ref<ruis::render::vertex_buffer> make_vertex_buffer( //
8689
utki::span<const float> vertices
87-
) override;
90+
) const override;
8891

8992
utki::shared_ref<ruis::render::vertex_buffer> make_vertex_buffer( //
9093
utki::span<const r4::vector2<float>> vertices
91-
) override;
94+
) const override;
9295

9396
utki::shared_ref<ruis::render::vertex_buffer> make_vertex_buffer( //
9497
utki::span<const r4::vector3<float>> vertices
95-
) override;
98+
) const override;
9699

97100
utki::shared_ref<ruis::render::vertex_buffer> make_vertex_buffer( //
98101
utki::span<const r4::vector4<float>> vertices
99-
) override;
102+
) const override;
100103

101104
// =====================================
102105
// ====== state control functions ======
@@ -107,7 +110,7 @@ class context : public ruis::render::context
107110

108111
void clear_framebuffer_stencil() override {}
109112

110-
r4::vector2<uint32_t> to_window_coords(ruis::vec2 point) const override
113+
r4::vector2<uint32_t> to_window_coords(const ruis::vec2& point) const override
111114
{
112115
return {0, 0};
113116
}
@@ -141,9 +144,9 @@ class context : public ruis::render::context
141144

142145
void enable_scissor(bool enable) override {}
143146

144-
void set_scissor(r4::rectangle<uint32_t> r) override {}
147+
void set_scissor(const r4::rectangle<uint32_t>& r) override {}
145148

146-
void set_viewport(r4::rectangle<uint32_t> r) override {}
149+
void set_viewport(const r4::rectangle<uint32_t>& r) override {}
147150

148151
bool is_depth_enabled() const noexcept override
149152
{

‎src/ruis/render/null/index_buffer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
2424
using namespace ruis::render::null;
2525

2626
index_buffer::index_buffer(
27-
utki::shared_ref<ruis::render::context> rendering_context, //
27+
utki::shared_ref<const ruis::render::context> rendering_context, //
2828
utki::span<const uint16_t> indices
2929
) :
3030
ruis::render::index_buffer(std::move(rendering_context)),
3131
indices(utki::make_vector(indices))
3232
{}
3333

3434
index_buffer::index_buffer(
35-
utki::shared_ref<ruis::render::context> rendering_context, //
35+
utki::shared_ref<const ruis::render::context> rendering_context, //
3636
utki::span<const uint32_t> indices
3737
) :
3838
ruis::render::index_buffer(std::move(rendering_context)),

‎src/ruis/render/null/index_buffer.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ class index_buffer : public ruis::render::index_buffer
3939
indices;
4040

4141
index_buffer(
42-
utki::shared_ref<ruis::render::context> rendering_context, //
42+
utki::shared_ref<const ruis::render::context> rendering_context, //
4343
utki::span<const uint16_t> indices
4444
);
4545
index_buffer(
46-
utki::shared_ref<ruis::render::context> rendering_context, //
46+
utki::shared_ref<const ruis::render::context> rendering_context, //
4747
utki::span<const uint32_t> indices
4848
);
4949
};

‎src/ruis/render/null/texture_2d.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
2424
using namespace ruis::render::null;
2525

2626
texture_2d::texture_2d(
27-
utki::shared_ref<ruis::render::context> rendering_context, //
27+
utki::shared_ref<const ruis::render::context> rendering_context, //
2828
rasterimage::image_variant image,
2929
ruis::render::context::texture_2d_parameters params
3030
) :

‎src/ruis/render/null/texture_2d.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class texture_2d : public ruis::render::texture_2d
3434
const rasterimage::image_variant image;
3535

3636
texture_2d(
37-
utki::shared_ref<ruis::render::context> rendering_context, //
37+
utki::shared_ref<const ruis::render::context> rendering_context, //
3838
rasterimage::image_variant image,
3939
ruis::render::context::texture_2d_parameters params
4040
);

‎src/ruis/render/null/texture_cube.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
2424
using namespace ruis::render::null;
2525

2626
texture_cube::texture_cube(
27-
utki::shared_ref<ruis::render::context> rendering_context, //
27+
utki::shared_ref<const ruis::render::context> rendering_context, //
2828
rasterimage::image_variant&& positive_x,
2929
rasterimage::image_variant&& negative_x,
3030
rasterimage::image_variant&& positive_y,

‎src/ruis/render/null/texture_cube.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class texture_cube : public ruis::render::texture_cube
3737
const rasterimage::image_variant negative_z;
3838

3939
texture_cube(
40-
utki::shared_ref<ruis::render::context> rendering_context, //
40+
utki::shared_ref<const ruis::render::context> rendering_context, //
4141
rasterimage::image_variant&& positive_x,
4242
rasterimage::image_variant&& negative_x,
4343
rasterimage::image_variant&& positive_y,

‎src/ruis/render/null/texture_depth.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
2424
using namespace ruis::render::null;
2525

2626
texture_depth::texture_depth(
27-
utki::shared_ref<ruis::render::context> rendering_context, //
27+
utki::shared_ref<const ruis::render::context> rendering_context, //
2828
r4::vector2<uint32_t> dims
2929
) :
3030
ruis::render::texture_depth(

‎src/ruis/render/null/texture_depth.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class texture_depth : public ruis::render::texture_depth
2929
{
3030
public:
3131
texture_depth(
32-
utki::shared_ref<ruis::render::context> rendering_context, //
32+
utki::shared_ref<const ruis::render::context> rendering_context, //
3333
r4::vector2<uint32_t> dims
3434
);
3535
};

0 commit comments

Comments
 (0)