Commit cca6d879 authored by Florian Oetke's avatar Florian Oetke
Browse files

removed range-v3 dependency

parent 52c937cc
......@@ -20,7 +20,6 @@ SET(PHYSFS_ARCHIVE_7Z FALSE)
SET(PHYSFS_BUILD_SHARED FALSE)
add_subdirectory(physfs)
include(range-v3_interface.cmake)
add_subdirectory(sdl_vulkan)
add_subdirectory(sf2)
add_subdirectory(stb_image)
......
......@@ -44,7 +44,6 @@ target_link_libraries(mirrage_graphic
mirrage::utils
glm
gsl
range-v3
mirrage::asset
sf2
sdl2::sdl2
......
......@@ -8,7 +8,6 @@
#include <mirrage/utils/units.hpp>
#include <vulkan/vulkan.hpp>
#include <range/v3/view.hpp>
#include <vector>
#include <memory>
......
......@@ -12,7 +12,6 @@
#include <mirrage/utils/ring_buffer.hpp>
#include <vulkan/vulkan.hpp>
#include <range/v3/view.hpp>
#include <unordered_map>
#include <string>
......@@ -27,8 +26,8 @@ namespace graphic {
Swapchain() = default;
Swapchain(const vk::Device& dev, Window&, vk::SwapchainCreateInfoKHR);
auto get_images()const {
return _image_views | ranges::view::transform([&](auto& v){return v.get();}) | ranges::to_vector;
auto get_images()const -> auto& {
return _image_views;
}
auto acquireNextImage(vk::Semaphore, vk::Fence)const -> std::size_t;
......
......@@ -56,7 +56,7 @@ namespace renderer {
auto render_pass = builder.build();
for(auto& sc_image : renderer.swapchain().get_images()) {
out_framebuffers.emplace_back(builder.build_framebuffer({sc_image, util::Rgba{}},
out_framebuffers.emplace_back(builder.build_framebuffer({*sc_image, util::Rgba{}},
renderer.swapchain().image_width(),
renderer.swapchain().image_height()));
}
......
......@@ -61,7 +61,7 @@ namespace renderer {
auto render_pass = builder.build();
for(auto& sc_image : renderer.swapchain().get_images()) {
out_framebuffers.emplace_back(builder.build_framebuffer({sc_image, util::Rgba{}},
out_framebuffers.emplace_back(builder.build_framebuffer({*sc_image, util::Rgba{}},
renderer.swapchain().image_width(),
renderer.swapchain().image_height()));
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment