From 76a70270137a4e2acac75e913fc1d67ec038b11a Mon Sep 17 00:00:00 2001 From: Michael Bradley Date: Tue, 25 Feb 2025 22:55:53 -0500 Subject: [PATCH 1/2] Update .gitignore --- .gitignore | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 822dd55..89c6b0d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,7 @@ -cmake-build-*/ +# IDE files .idea/ +.vscode/ + +# Build artifacts +build/ +cmake-build-*/ From f673ec92ec031775f3bcc432d4fe93f9415f0834 Mon Sep 17 00:00:00 2001 From: Michael Bradley Date: Tue, 25 Feb 2025 22:58:00 -0500 Subject: [PATCH 2/2] Move shaders into their own directory --- CMakeLists.txt | 10 +++++----- src/{ => shader}/phong.frag | 0 src/{ => shader}/phong.vert | 0 src/{ => shader}/shadow.frag | 0 src/{ => shader}/shadow.geom | 0 src/{ => shader}/shadow.vert | 0 6 files changed, 5 insertions(+), 5 deletions(-) rename src/{ => shader}/phong.frag (100%) rename src/{ => shader}/phong.vert (100%) rename src/{ => shader}/shadow.frag (100%) rename src/{ => shader}/shadow.geom (100%) rename src/{ => shader}/shadow.vert (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 93e5e18..9d7faaf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,13 +27,13 @@ add_executable(perlin-shadows src/renderable.h ) -file(READ src/phong.vert PHONG_VERT) -file(READ src/phong.frag PHONG_FRAG) +file(READ src/shader/phong.vert PHONG_VERT) +file(READ src/shader/phong.frag PHONG_FRAG) configure_file(src/renderer.in.cpp src/renderer.cpp @ONLY) -file(READ src/shadow.vert SHADOW_VERT) -file(READ src/shadow.frag SHADOW_FRAG) -file(READ src/shadow.geom SHADOW_GEOM) +file(READ src/shader/shadow.vert SHADOW_VERT) +file(READ src/shader/shadow.frag SHADOW_FRAG) +file(READ src/shader/shadow.geom SHADOW_GEOM) configure_file(src/point_light.in.h src/point_light.h @ONLY) target_include_directories(perlin-shadows PUBLIC "${CMAKE_CURRENT_BINARY_DIR}/src") diff --git a/src/phong.frag b/src/shader/phong.frag similarity index 100% rename from src/phong.frag rename to src/shader/phong.frag diff --git a/src/phong.vert b/src/shader/phong.vert similarity index 100% rename from src/phong.vert rename to src/shader/phong.vert diff --git a/src/shadow.frag b/src/shader/shadow.frag similarity index 100% rename from src/shadow.frag rename to src/shader/shadow.frag diff --git a/src/shadow.geom b/src/shader/shadow.geom similarity index 100% rename from src/shadow.geom rename to src/shader/shadow.geom diff --git a/src/shadow.vert b/src/shader/shadow.vert similarity index 100% rename from src/shadow.vert rename to src/shader/shadow.vert