redstrate/novus
1
Fork 0
mirror of https://github.com/redstrate/Novus.git synced 2025-05-01 07:57:44 +00:00
Code Activity

renderer: Clean up CMakeLists, remove standalone window

Browse source
This commit is contained in:
Joshua Goins 2023-10-10 18:31:50 -04:00
parent a25a7b948d
commit 44732293ac
3 changed files with 2 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
renderer/CMakeLists.txt
View file

@ -1,18 +1,11 @@
# SPDX-FileCopyrightText: 2023 Joshua Goins <josh@redstrate.com> # SPDX-FileCopyrightText: 2023 Joshua Goins <josh@redstrate.com>
# SPDX-License-Identifier: CC0-1.0 # 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) add_library(renderer STATIC)
target_sources(renderer PRIVATE target_sources(renderer PRIVATE
src/renderer.cpp src/renderer.cpp
src/imguipass.cpp src/imguipass.cpp
src/imguipass.h src/imguipass.h)
${EXTRA_SRC})
qt_add_resources(renderer "shaders" qt_add_resources(renderer "shaders"
PREFIX "/" PREFIX "/"
FILES FILES
@ -21,9 +14,5 @@ qt_add_resources(renderer "shaders"
shaders/mesh.frag.spv shaders/mesh.frag.spv
shaders/mesh.vert.spv) shaders/mesh.vert.spv)
target_include_directories(renderer PUBLIC include) 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) 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()

23
renderer/include/standalonewindow.h
View file

@ -1,23 +0,0 @@
// SPDX-FileCopyrightText: 2023 Joshua Goins <josh@redstrate.com>
// 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<RenderModel> models;
private:
Renderer* m_renderer;
SDL_Window* m_window;
};

24
renderer/src/standalonewindow.cpp
View file

@ -1,24 +0,0 @@
// SPDX-FileCopyrightText: 2023 Joshua Goins <josh@redstrate.com>
// SPDX-License-Identifier: GPL-3.0-or-later
#include "standalonewindow.h"
#include <SDL.h>
#include <SDL_vulkan.h>
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);
}