Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
139 changes: 0 additions & 139 deletions src/ruis/render/null/context.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "context.hpp"

#include "frame_buffer.hpp"
#include "index_buffer.hpp"
#include "texture_2d.hpp"
#include "texture_cube.hpp"
#include "texture_depth.hpp"
#include "vertex_array.hpp"
#include "vertex_buffer.hpp"

using namespace ruis::render::null;

Expand All @@ -44,136 +38,3 @@ utki::shared_ref<ruis::render::frame_buffer> context::make_framebuffer(
std::move(stencil)
);
}

utki::shared_ref<ruis::render::index_buffer> context::make_index_buffer(utki::span<const uint16_t> indices) const
{
return utki::make_shared<index_buffer>(
this->get_shared_ref(), //
indices
);
}

utki::shared_ref<ruis::render::index_buffer> context::make_index_buffer(utki::span<const uint32_t> indices) const
{
return utki::make_shared<index_buffer>(
this->get_shared_ref(), //
indices
);
}

utki::shared_ref<ruis::render::texture_2d> context::make_texture_2d(
rasterimage::format format,
rasterimage::dimensioned::dimensions_type dims,
texture_2d_parameters params
) const
{
return utki::make_shared<texture_2d>(
this->get_shared_ref(), //
rasterimage::image_variant(dims, format),
std::move(params)
);
}

utki::shared_ref<ruis::render::texture_2d> context::make_texture_2d(
const rasterimage::image_variant& imvar,
texture_2d_parameters params
) const
{
return utki::make_shared<texture_2d>(
this->get_shared_ref(), //
imvar,
std::move(params)
);
}

utki::shared_ref<ruis::render::texture_2d> context::make_texture_2d(
rasterimage::image_variant&& imvar,
texture_2d_parameters params
) const
{
return utki::make_shared<texture_2d>(
this->get_shared_ref(), //
std::move(imvar),
std::move(params)
);
}

utki::shared_ref<ruis::render::texture_depth> context::make_texture_depth(r4::vector2<uint32_t> dims) const
{
return utki::make_shared<texture_depth>(
this->get_shared_ref(), //
dims
);
}

utki::shared_ref<ruis::render::texture_cube> context::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
{
return utki::make_shared<texture_cube>(
this->get_shared_ref(), //
std::move(positive_x),
std::move(negative_x),
std::move(positive_y),
std::move(negative_y),
std::move(positive_z),
std::move(negative_z)
);
}

utki::shared_ref<ruis::render::vertex_array> context::make_vertex_array(
std::vector<utki::shared_ref<const ruis::render::vertex_buffer>> buffers,
utki::shared_ref<const ruis::render::index_buffer> indices,
ruis::render::vertex_array::mode rendering_mode
) const
{
return utki::make_shared<vertex_array>(
this->get_shared_ref(), //
std::move(buffers),
std::move(indices),
rendering_mode
);
}

utki::shared_ref<ruis::render::vertex_buffer> context::make_vertex_buffer(utki::span<const float> vertices) const
{
return utki::make_shared<vertex_buffer>(
this->get_shared_ref(), //
vertices
);
}

utki::shared_ref<ruis::render::vertex_buffer> context::make_vertex_buffer( //
utki::span<const r4::vector2<float>> vertices
) const
{
return utki::make_shared<vertex_buffer>(
this->get_shared_ref(), //
vertices
);
}

utki::shared_ref<ruis::render::vertex_buffer> context::make_vertex_buffer( //
utki::span<const r4::vector3<float>> vertices
) const
{
return utki::make_shared<vertex_buffer>(
this->get_shared_ref(), //
vertices
);
}

utki::shared_ref<ruis::render::vertex_buffer> context::make_vertex_buffer( //
utki::span<const r4::vector4<float>> vertices
) const
{
return utki::make_shared<vertex_buffer>(
this->get_shared_ref(), //
vertices
);
}
66 changes: 7 additions & 59 deletions src/ruis/render/null/context.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,86 +24,34 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <rasterimage/image_variant.hpp>
#include <ruis/render/context.hpp>

#include "factory.hpp"

namespace ruis::render::null {

class context : public ruis::render::context
{
public:
context(
utki::shared_ref<ruis::render::native_window> native_window = utki::make_shared<ruis::render::native_window>()
utki::shared_ref<ruis::render::native_window> native_window =
utki::make_shared<ruis::render::native_window>(), //
utki::shared_ref<const ruis::render::factory> factory = utki::make_shared<null::factory>()
) :
ruis::render::context(
std::move(native_window), //
std::move(factory), //
parameters()
)
{}

// ===============================
// ====== factory functions ======

utki::shared_ref<ruis::render::context::shaders> make_shaders() const override
{
return utki::make_shared<ruis::render::context::shaders>();
}

utki::shared_ref<ruis::render::frame_buffer> make_framebuffer(
std::shared_ptr<ruis::render::texture_2d> color,
std::shared_ptr<ruis::render::texture_depth> depth,
std::shared_ptr<ruis::render::texture_stencil> stencil
) override;

utki::shared_ref<ruis::render::index_buffer> make_index_buffer(utki::span<const uint16_t> indices) const override;
utki::shared_ref<ruis::render::index_buffer> make_index_buffer(utki::span<const uint32_t> indices) const override;

utki::shared_ref<ruis::render::texture_2d> make_texture_2d(
rasterimage::format format,
rasterimage::dimensioned::dimensions_type dims,
texture_2d_parameters params
) const override;

utki::shared_ref<ruis::render::texture_2d> make_texture_2d(
const rasterimage::image_variant& imvar,
texture_2d_parameters params
) const override;

utki::shared_ref<ruis::render::texture_2d> make_texture_2d(
rasterimage::image_variant&& imvar,
texture_2d_parameters params
) const override;

utki::shared_ref<ruis::render::texture_depth> make_texture_depth(r4::vector2<uint32_t> dims) const override;

utki::shared_ref<ruis::render::texture_cube> 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 override;

utki::shared_ref<ruis::render::vertex_array> make_vertex_array(
std::vector<utki::shared_ref<const ruis::render::vertex_buffer>> buffers,
utki::shared_ref<const ruis::render::index_buffer> indices,
ruis::render::vertex_array::mode rendering_mode
) const override;

utki::shared_ref<ruis::render::vertex_buffer> make_vertex_buffer( //
utki::span<const float> vertices
) const override;

utki::shared_ref<ruis::render::vertex_buffer> make_vertex_buffer( //
utki::span<const r4::vector2<float>> vertices
) const override;

utki::shared_ref<ruis::render::vertex_buffer> make_vertex_buffer( //
utki::span<const r4::vector3<float>> vertices
) const override;

utki::shared_ref<ruis::render::vertex_buffer> make_vertex_buffer( //
utki::span<const r4::vector4<float>> vertices
) const override;

// =====================================
// ====== state control functions ======

Expand Down Expand Up @@ -159,4 +107,4 @@ class context : public ruis::render::context
void enable_depth(bool enable) override {}
};

} // namespace ruis::render::null
} // namespace ruis::render::null
Loading
Loading