diff --git a/renderer/CMakeLists.txt b/renderer/CMakeLists.txt index fd7b9f9..f64a73f 100644 --- a/renderer/CMakeLists.txt +++ b/renderer/CMakeLists.txt @@ -1,18 +1,11 @@ # SPDX-FileCopyrightText: 2023 Joshua Goins # SPDX-License-Identifier: CC0-1.0 -if(USE_STANDALONE_WINDOW) - find_package(SDL2 REQUIRED) - set(EXTRA_SRC src/standalonewindow.cpp) - set(EXTRA_LIBRARIES SDL2::SDL2) -endif() - add_library(renderer STATIC) target_sources(renderer PRIVATE src/renderer.cpp src/imguipass.cpp - src/imguipass.h - ${EXTRA_SRC}) + src/imguipass.h) qt_add_resources(renderer "shaders" PREFIX "/" FILES @@ -21,9 +14,5 @@ qt_add_resources(renderer "shaders" shaders/mesh.frag.spv shaders/mesh.vert.spv) target_include_directories(renderer PUBLIC include) -target_link_libraries(renderer PUBLIC Qt6::Core Vulkan::Vulkan physis z glm::glm imgui ${EXTRA_LIBRARIES}) +target_link_libraries(renderer PUBLIC Qt6::Core Vulkan::Vulkan physis z glm::glm imgui) target_compile_definitions(renderer PUBLIC GLM_FORCE_RADIANS GLM_FORCE_DEPTH_ZERO_TO_ONE) - -if(USE_STANDALONE_WINDOW) - target_compile_definitions(renderer PUBLIC USE_STANDALONE_WINDOW) -endif() \ No newline at end of file diff --git a/renderer/include/standalonewindow.h b/renderer/include/standalonewindow.h deleted file mode 100644 index 55a47b8..0000000 --- a/renderer/include/standalonewindow.h +++ /dev/null @@ -1,23 +0,0 @@ -// SPDX-FileCopyrightText: 2023 Joshua Goins -// SPDX-License-Identifier: GPL-3.0-or-later - -#pragma once - -#include "renderer.hpp" - -struct SDL_Window; - -class StandaloneWindow { -public: - StandaloneWindow(Renderer* renderer); - - VkSurfaceKHR getSurface(VkInstance instance); - - void render(); - - std::vector models; - -private: - Renderer* m_renderer; - SDL_Window* m_window; -}; \ No newline at end of file diff --git a/renderer/src/standalonewindow.cpp b/renderer/src/standalonewindow.cpp deleted file mode 100644 index 5c5b43a..0000000 --- a/renderer/src/standalonewindow.cpp +++ /dev/null @@ -1,24 +0,0 @@ -// SPDX-FileCopyrightText: 2023 Joshua Goins -// SPDX-License-Identifier: GPL-3.0-or-later - -#include "standalonewindow.h" - -#include -#include - -StandaloneWindow::StandaloneWindow(Renderer* renderer) : m_renderer(renderer) { - SDL_Init(SDL_INIT_EVERYTHING); - - m_window = SDL_CreateWindow( - "mdlviewer viewport", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, 640, 480, SDL_WINDOW_VULKAN); -} - -VkSurfaceKHR StandaloneWindow::getSurface(VkInstance instance) { - VkSurfaceKHR surface = VK_NULL_HANDLE; - SDL_Vulkan_CreateSurface(m_window, instance, &surface); - return surface; -} - -void StandaloneWindow::render() { - m_renderer->render(models); -}