From d2b5fc5b3bc648afffa42375706429685ac63794 Mon Sep 17 00:00:00 2001 From: Mel Date: Mon, 12 Feb 2024 12:55:11 +0100 Subject: Split rendering into own thread and sync through render action lists --- CMakeLists.txt | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 61e57e5..c477d0e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,6 +28,9 @@ endif (WIN32) add_executable(meowcraft src/main.cpp + src/Defines.hpp + src/Game.cpp src/Game.hpp + src/Render.cpp src/Render.hpp src/Common/Sizes.hpp src/GFX/Window.cpp src/GFX/Window.hpp src/GFX/Mesh.cpp src/GFX/Mesh.hpp @@ -80,6 +83,8 @@ add_executable(meowcraft src/Common/Casts.hpp src/World/VoxelTraversal.hpp src/Common/Assert.hpp + src/GFX/Actions.hpp + src/GFX/Resources.cpp src/GFX/Resources.hpp ) if (WIN32) @@ -90,12 +95,20 @@ target_link_libraries(meowcraft PRIVATE glfw GLEW::glew_s OpenGL::GL ${LINK_FLAG function(make_includable input_file output_file) file(READ ${input_file} content) - set(delim "for_c++_include") - set(content "R\"${delim}(\n${content})${delim}\"") + set(delim "meowcraft_asset") + set(content "R\"${delim}(${content})${delim}\"") file(WRITE ${output_file} "${content}") endfunction(make_includable) -make_includable(assets/shaders/fragment.glsl assets/generated/shaders/fragment.glsl.includable) -make_includable(assets/shaders/vertex.glsl assets/generated/shaders/vertex.glsl.includable) +function(make_assets) + foreach(file ${ARGN}) + make_includable(assets/${file} assets/generated/${file}.include) + endforeach() +endfunction(make_assets) -make_includable(assets/images/atlas.ppm assets/generated/images/atlas.ppm.includable) \ No newline at end of file +make_assets(images/atlas.ppm + shaders/terrain.frag.glsl shaders/terrain.vert.glsl + shaders/clouds.frag.glsl shaders/clouds.vert.glsl + shaders/image_viewer.frag.glsl shaders/image_viewer.vert.glsl + shaders/block_outline.frag.glsl shaders/block_outline.vert.glsl +) \ No newline at end of file -- cgit 1.4.1