Skip to content

Commit 7163b31

Browse files
committed
stuff
1 parent 5d60ec8 commit 7163b31

File tree

5 files changed

+70
-18
lines changed

5 files changed

+70
-18
lines changed

src/ruis/render/null/factory.cpp

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,34 +125,47 @@ utki::shared_ref<ruis::render::vertex_array> factory::create_vertex_array(
125125
)
126126
{
127127
return utki::make_shared<vertex_array>(
128-
std::move(buffers), //
128+
this->get_renderer(), //
129+
std::move(buffers),
129130
std::move(indices),
130131
rendering_mode
131132
);
132133
}
133134

134135
utki::shared_ref<ruis::render::vertex_buffer> factory::create_vertex_buffer(utki::span<const float> vertices)
135136
{
136-
return utki::make_shared<vertex_buffer>(vertices);
137+
return utki::make_shared<vertex_buffer>(
138+
this->get_renderer(), //
139+
vertices
140+
);
137141
}
138142

139143
utki::shared_ref<ruis::render::vertex_buffer> factory::create_vertex_buffer(
140144
utki::span<const r4::vector2<float>> vertices
141145
)
142146
{
143-
return utki::make_shared<vertex_buffer>(vertices);
147+
return utki::make_shared<vertex_buffer>(
148+
this->get_renderer(), //
149+
vertices
150+
);
144151
}
145152

146153
utki::shared_ref<ruis::render::vertex_buffer> factory::create_vertex_buffer(
147154
utki::span<const r4::vector3<float>> vertices
148155
)
149156
{
150-
return utki::make_shared<vertex_buffer>(vertices);
157+
return utki::make_shared<vertex_buffer>(
158+
this->get_renderer(), //
159+
vertices
160+
);
151161
}
152162

153163
utki::shared_ref<ruis::render::vertex_buffer> factory::create_vertex_buffer(
154164
utki::span<const r4::vector4<float>> vertices
155165
)
156166
{
157-
return utki::make_shared<vertex_buffer>(vertices);
167+
return utki::make_shared<vertex_buffer>(
168+
this->get_renderer(), //
169+
vertices
170+
);
158171
}

src/ruis/render/null/vertex_array.cpp

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

2626
vertex_array::vertex_array(
27+
utki::shared_ref<ruis::render::renderer> renderer, //
2728
std::vector<utki::shared_ref<const ruis::render::vertex_buffer>> buffers,
2829
utki::shared_ref<const ruis::render::index_buffer> indices,
2930
ruis::render::vertex_array::mode rendering_mode
3031
) :
3132
ruis::render::vertex_array(
32-
std::move(buffers), //
33+
std::move(renderer), //
34+
std::move(buffers),
3335
std::move(indices),
3436
rendering_mode
3537
)

src/ruis/render/null/vertex_array.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ class vertex_array : public ruis::render::vertex_array
3232
{
3333
public:
3434
vertex_array(
35+
utki::shared_ref<ruis::render::renderer> renderer, //
3536
std::vector<utki::shared_ref<const ruis::render::vertex_buffer>> buffers,
3637
utki::shared_ref<const ruis::render::index_buffer> indices,
3738
ruis::render::vertex_array::mode rendering_mode

src/ruis/render/null/vertex_buffer.cpp

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,46 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
2323

2424
using namespace ruis::render::null;
2525

26-
vertex_buffer::vertex_buffer(utki::span<const float> vertices) :
27-
ruis::render::vertex_buffer(vertices.size()),
26+
vertex_buffer::vertex_buffer(
27+
utki::shared_ref<ruis::render::renderer> renderer, //
28+
utki::span<const float> vertices
29+
) :
30+
ruis::render::vertex_buffer(
31+
std::move(renderer), //
32+
vertices.size()
33+
),
2834
vertices(utki::make_vector(vertices))
2935
{}
3036

31-
vertex_buffer::vertex_buffer(utki::span<const r4::vector2<float>> vertices) :
32-
ruis::render::vertex_buffer(vertices.size()),
37+
vertex_buffer::vertex_buffer(
38+
utki::shared_ref<ruis::render::renderer> renderer, //
39+
utki::span<const r4::vector2<float>> vertices
40+
) :
41+
ruis::render::vertex_buffer(
42+
std::move(renderer), //
43+
vertices.size()
44+
),
3345
vertices(utki::make_vector(vertices))
3446
{}
3547

36-
vertex_buffer::vertex_buffer(utki::span<const r4::vector3<float>> vertices) :
37-
ruis::render::vertex_buffer(vertices.size()),
48+
vertex_buffer::vertex_buffer(
49+
utki::shared_ref<ruis::render::renderer> renderer, //
50+
utki::span<const r4::vector3<float>> vertices
51+
) :
52+
ruis::render::vertex_buffer(
53+
std::move(renderer), //
54+
vertices.size()
55+
),
3856
vertices(utki::make_vector(vertices))
3957
{}
4058

41-
vertex_buffer::vertex_buffer(utki::span<const r4::vector4<float>> vertices) :
42-
ruis::render::vertex_buffer(vertices.size()),
59+
vertex_buffer::vertex_buffer(
60+
utki::shared_ref<ruis::render::renderer> renderer, //
61+
utki::span<const r4::vector4<float>> vertices
62+
) :
63+
ruis::render::vertex_buffer(
64+
std::move(renderer), //
65+
vertices.size()
66+
),
4367
vertices(utki::make_vector(vertices))
4468
{}

src/ruis/render/null/vertex_buffer.hpp

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,22 @@ class vertex_buffer : public ruis::render::vertex_buffer
4040
std::vector<r4::vector4<float>>>
4141
vertices;
4242

43-
vertex_buffer(utki::span<const float> vertices);
44-
vertex_buffer(utki::span<const r4::vector2<float>> vertices);
45-
vertex_buffer(utki::span<const r4::vector3<float>> vertices);
46-
vertex_buffer(utki::span<const r4::vector4<float>> vertices);
43+
vertex_buffer(
44+
utki::shared_ref<ruis::render::renderer> renderer, //
45+
utki::span<const float> vertices
46+
);
47+
vertex_buffer(
48+
utki::shared_ref<ruis::render::renderer> renderer, //
49+
utki::span<const r4::vector2<float>> vertices
50+
);
51+
vertex_buffer(
52+
utki::shared_ref<ruis::render::renderer> renderer, //
53+
utki::span<const r4::vector3<float>> vertices
54+
);
55+
vertex_buffer(
56+
utki::shared_ref<ruis::render::renderer> renderer, //
57+
utki::span<const r4::vector4<float>> vertices
58+
);
4759
};
4860

4961
} // namespace ruis::render::null

0 commit comments

Comments
 (0)