From c4c808f3c59b03f19687d871feb1ee30b9504c14 Mon Sep 17 00:00:00 2001 From: "Zed A. Shaw" Date: Sat, 5 Sep 2026 15:27:17 -0400 Subject: [PATCH] Didn't really do anything with advanced data/glsl so let's do geometry shaders. --- .../.gitignore | 0 .../.vimrc_proj | 0 .../LICENSE | 0 .../Makefile | 0 .../assets/blending_transparent_window.png | Bin .../assets/container2.png | Bin .../assets/crate.bbmodel | 0 .../assets/crate.glb | Bin .../assets/crate.mtl | 0 .../assets/crate.obj | 0 .../assets/grass.bbmodel | 0 .../assets/grass.glb | Bin .../assets/grass.png | Bin .../assets/grass_bb.glb | Bin .../assets/marble.png | Bin .../assets/marble_cube.bbmodel | 0 .../assets/marble_cube.glb | Bin .../assets/metal.png | Bin .../assets/metal_floor.bbmodel | 0 .../assets/metal_floor.glb | Bin .../assets/popcorn_model_a.glb | Bin .../assets/window.bbmodel | 0 .../assets/window.glb | Bin .../backpack.zip | Bin .../config.json | 0 .../meson.build | 0 .../resources/textures/awesomeface.png | Bin .../resources/textures/container.jpg | Bin .../resources/textures/container2.png | Bin .../resources/textures/container2_specular.png | Bin .../resources/textures/popcorn.jpg | Bin .../scripts/reset_build.ps1 | 0 .../scripts/reset_build.sh | 0 .../scripts/setup.ps1 | 0 .../scripts/setup.sh | 0 .../scripts/watch_build.sh | 0 .../scripts/windows_setup.ps1 | 0 .../shaders/08-frag.glsl | 0 .../shaders/08-lightsource.frag.glsl | 0 .../shaders/08-vert.glsl | 0 .../shaders/11-frag.glsl | 0 .../shaders/11-lightsource.frag.glsl | 0 .../shaders/11-vert.glsl | 0 .../shaders/12-frag.glsl | 0 .../shaders/12-lightsource.frag.glsl | 0 .../shaders/12-vert.glsl | 0 .../shaders/13-frag.glsl | 0 .../shaders/13-lightsource.frag.glsl | 0 .../shaders/13-vert.glsl | 0 .../shaders/14-frag.glsl | 0 .../shaders/14-lightsource.frag.glsl | 0 .../shaders/14-vert.glsl | 0 .../shaders/16-frag.glsl | 0 .../shaders/16-lightsource.frag.glsl | 0 .../shaders/16-vert.glsl | 0 .../shaders/17-frag.glsl | 0 .../shaders/17-lightsource.frag.glsl | 0 .../shaders/17-vert.glsl | 0 .../shaders/18-frag.glsl | 0 .../shaders/18-lightsource.frag.glsl | 0 .../shaders/18-outline.glsl | 0 .../shaders/18-vert.glsl | 0 .../shaders/19-frag.glsl | 0 .../shaders/19-lightsource.frag.glsl | 0 .../shaders/19-vert.glsl | 0 .../shaders/21-framebuffers.frag.glsl | 0 .../shaders/21-framebuffers.vert.glsl | 0 .../shaders/21-screen-kernel.frag.glsl | 0 .../shaders/21-screen.frag.glsl | 0 .../shaders/21-screen.vert.glsl | 0 .../shaders/24-frag.glsl | 0 .../shaders/24-skybox.frag.glsl | 0 .../shaders/24-skybox.vert.glsl | 0 .../shaders/24-vert.glsl | 0 .../shaders/3.3.shader.fs | 0 .../shaders/3.3.shader.vs | 0 .../shaders/4.2.texture.fs | 0 .../shaders/4.2.texture.vs | 0 .../src/KHR/khrplatform.h | 0 .../src/camera.cpp | 0 .../src/camera.hpp | 0 .../src/components.hpp | 0 .../src/dbc.cpp | 0 .../src/dbc.hpp | 0 .../src/framebuffer.cpp | 0 .../src/framebuffer.hpp | 0 .../src/glad/glad.cpp | 0 .../src/glad/glad.h | 0 .../src/json.hpp | 0 .../src/main.cpp | 0 .../src/mesh.cpp | 0 .../src/mesh.hpp | 0 .../src/model.cpp | 0 .../src/model.hpp | 0 .../src/scene.cpp | 0 .../src/scene.hpp | 0 .../src/screen.cpp | 0 .../src/screen.hpp | 0 .../src/shader.cpp | 0 .../src/shader.hpp | 0 .../src/skybox.hpp | 0 .../src/stb_image.cpp | 0 .../src/stb_image.h | 0 .../src/utils.cpp | 0 .../src/utils.hpp | 0 .../tests/bad_shader.vs | 0 .../tests/config.json | 0 .../tests/config_tests.cpp | 0 .../tests/main.cpp | 0 .../tests/meson.build | 0 .../tests/model_tests.cpp | 0 .../tests/shader_tests.cpp | 0 .../wraps/assimp.wrap | 0 .../wraps/box2d.wrap | 0 .../wraps/fmt.wrap | 0 .../wraps/fuc2.wrap | 0 .../wraps/glfw.wrap | 0 .../wraps/glm.wrap | 0 .../wraps/nlohmann_json.wrap | 0 119 files changed, 0 insertions(+), 0 deletions(-) rename {26-advanced-data-glsl => 26-geometry-shaders}/.gitignore (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/.vimrc_proj (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/LICENSE (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/Makefile (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/assets/blending_transparent_window.png (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/assets/container2.png (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/assets/crate.bbmodel (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/assets/crate.glb (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/assets/crate.mtl (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/assets/crate.obj (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/assets/grass.bbmodel (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/assets/grass.glb (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/assets/grass.png (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/assets/grass_bb.glb (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/assets/marble.png (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/assets/marble_cube.bbmodel (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/assets/marble_cube.glb (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/assets/metal.png (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/assets/metal_floor.bbmodel (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/assets/metal_floor.glb (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/assets/popcorn_model_a.glb (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/assets/window.bbmodel (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/assets/window.glb (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/backpack.zip (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/config.json (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/meson.build (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/resources/textures/awesomeface.png (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/resources/textures/container.jpg (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/resources/textures/container2.png (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/resources/textures/container2_specular.png (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/resources/textures/popcorn.jpg (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/scripts/reset_build.ps1 (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/scripts/reset_build.sh (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/scripts/setup.ps1 (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/scripts/setup.sh (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/scripts/watch_build.sh (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/scripts/windows_setup.ps1 (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/shaders/08-frag.glsl (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/shaders/08-lightsource.frag.glsl (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/shaders/08-vert.glsl (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/shaders/11-frag.glsl (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/shaders/11-lightsource.frag.glsl (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/shaders/11-vert.glsl (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/shaders/12-frag.glsl (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/shaders/12-lightsource.frag.glsl (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/shaders/12-vert.glsl (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/shaders/13-frag.glsl (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/shaders/13-lightsource.frag.glsl (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/shaders/13-vert.glsl (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/shaders/14-frag.glsl (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/shaders/14-lightsource.frag.glsl (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/shaders/14-vert.glsl (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/shaders/16-frag.glsl (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/shaders/16-lightsource.frag.glsl (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/shaders/16-vert.glsl (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/shaders/17-frag.glsl (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/shaders/17-lightsource.frag.glsl (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/shaders/17-vert.glsl (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/shaders/18-frag.glsl (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/shaders/18-lightsource.frag.glsl (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/shaders/18-outline.glsl (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/shaders/18-vert.glsl (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/shaders/19-frag.glsl (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/shaders/19-lightsource.frag.glsl (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/shaders/19-vert.glsl (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/shaders/21-framebuffers.frag.glsl (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/shaders/21-framebuffers.vert.glsl (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/shaders/21-screen-kernel.frag.glsl (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/shaders/21-screen.frag.glsl (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/shaders/21-screen.vert.glsl (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/shaders/24-frag.glsl (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/shaders/24-skybox.frag.glsl (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/shaders/24-skybox.vert.glsl (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/shaders/24-vert.glsl (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/shaders/3.3.shader.fs (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/shaders/3.3.shader.vs (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/shaders/4.2.texture.fs (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/shaders/4.2.texture.vs (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/src/KHR/khrplatform.h (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/src/camera.cpp (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/src/camera.hpp (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/src/components.hpp (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/src/dbc.cpp (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/src/dbc.hpp (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/src/framebuffer.cpp (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/src/framebuffer.hpp (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/src/glad/glad.cpp (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/src/glad/glad.h (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/src/json.hpp (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/src/main.cpp (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/src/mesh.cpp (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/src/mesh.hpp (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/src/model.cpp (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/src/model.hpp (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/src/scene.cpp (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/src/scene.hpp (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/src/screen.cpp (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/src/screen.hpp (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/src/shader.cpp (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/src/shader.hpp (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/src/skybox.hpp (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/src/stb_image.cpp (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/src/stb_image.h (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/src/utils.cpp (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/src/utils.hpp (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/tests/bad_shader.vs (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/tests/config.json (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/tests/config_tests.cpp (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/tests/main.cpp (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/tests/meson.build (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/tests/model_tests.cpp (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/tests/shader_tests.cpp (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/wraps/assimp.wrap (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/wraps/box2d.wrap (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/wraps/fmt.wrap (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/wraps/fuc2.wrap (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/wraps/glfw.wrap (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/wraps/glm.wrap (100%) rename {26-advanced-data-glsl => 26-geometry-shaders}/wraps/nlohmann_json.wrap (100%) diff --git a/26-advanced-data-glsl/.gitignore b/26-geometry-shaders/.gitignore similarity index 100% rename from 26-advanced-data-glsl/.gitignore rename to 26-geometry-shaders/.gitignore diff --git a/26-advanced-data-glsl/.vimrc_proj b/26-geometry-shaders/.vimrc_proj similarity index 100% rename from 26-advanced-data-glsl/.vimrc_proj rename to 26-geometry-shaders/.vimrc_proj diff --git a/26-advanced-data-glsl/LICENSE b/26-geometry-shaders/LICENSE similarity index 100% rename from 26-advanced-data-glsl/LICENSE rename to 26-geometry-shaders/LICENSE diff --git a/26-advanced-data-glsl/Makefile b/26-geometry-shaders/Makefile similarity index 100% rename from 26-advanced-data-glsl/Makefile rename to 26-geometry-shaders/Makefile diff --git a/26-advanced-data-glsl/assets/blending_transparent_window.png b/26-geometry-shaders/assets/blending_transparent_window.png similarity index 100% rename from 26-advanced-data-glsl/assets/blending_transparent_window.png rename to 26-geometry-shaders/assets/blending_transparent_window.png diff --git a/26-advanced-data-glsl/assets/container2.png b/26-geometry-shaders/assets/container2.png similarity index 100% rename from 26-advanced-data-glsl/assets/container2.png rename to 26-geometry-shaders/assets/container2.png diff --git a/26-advanced-data-glsl/assets/crate.bbmodel b/26-geometry-shaders/assets/crate.bbmodel similarity index 100% rename from 26-advanced-data-glsl/assets/crate.bbmodel rename to 26-geometry-shaders/assets/crate.bbmodel diff --git a/26-advanced-data-glsl/assets/crate.glb b/26-geometry-shaders/assets/crate.glb similarity index 100% rename from 26-advanced-data-glsl/assets/crate.glb rename to 26-geometry-shaders/assets/crate.glb diff --git a/26-advanced-data-glsl/assets/crate.mtl b/26-geometry-shaders/assets/crate.mtl similarity index 100% rename from 26-advanced-data-glsl/assets/crate.mtl rename to 26-geometry-shaders/assets/crate.mtl diff --git a/26-advanced-data-glsl/assets/crate.obj b/26-geometry-shaders/assets/crate.obj similarity index 100% rename from 26-advanced-data-glsl/assets/crate.obj rename to 26-geometry-shaders/assets/crate.obj diff --git a/26-advanced-data-glsl/assets/grass.bbmodel b/26-geometry-shaders/assets/grass.bbmodel similarity index 100% rename from 26-advanced-data-glsl/assets/grass.bbmodel rename to 26-geometry-shaders/assets/grass.bbmodel diff --git a/26-advanced-data-glsl/assets/grass.glb b/26-geometry-shaders/assets/grass.glb similarity index 100% rename from 26-advanced-data-glsl/assets/grass.glb rename to 26-geometry-shaders/assets/grass.glb diff --git a/26-advanced-data-glsl/assets/grass.png b/26-geometry-shaders/assets/grass.png similarity index 100% rename from 26-advanced-data-glsl/assets/grass.png rename to 26-geometry-shaders/assets/grass.png diff --git a/26-advanced-data-glsl/assets/grass_bb.glb b/26-geometry-shaders/assets/grass_bb.glb similarity index 100% rename from 26-advanced-data-glsl/assets/grass_bb.glb rename to 26-geometry-shaders/assets/grass_bb.glb diff --git a/26-advanced-data-glsl/assets/marble.png b/26-geometry-shaders/assets/marble.png similarity index 100% rename from 26-advanced-data-glsl/assets/marble.png rename to 26-geometry-shaders/assets/marble.png diff --git a/26-advanced-data-glsl/assets/marble_cube.bbmodel b/26-geometry-shaders/assets/marble_cube.bbmodel similarity index 100% rename from 26-advanced-data-glsl/assets/marble_cube.bbmodel rename to 26-geometry-shaders/assets/marble_cube.bbmodel diff --git a/26-advanced-data-glsl/assets/marble_cube.glb b/26-geometry-shaders/assets/marble_cube.glb similarity index 100% rename from 26-advanced-data-glsl/assets/marble_cube.glb rename to 26-geometry-shaders/assets/marble_cube.glb diff --git a/26-advanced-data-glsl/assets/metal.png b/26-geometry-shaders/assets/metal.png similarity index 100% rename from 26-advanced-data-glsl/assets/metal.png rename to 26-geometry-shaders/assets/metal.png diff --git a/26-advanced-data-glsl/assets/metal_floor.bbmodel b/26-geometry-shaders/assets/metal_floor.bbmodel similarity index 100% rename from 26-advanced-data-glsl/assets/metal_floor.bbmodel rename to 26-geometry-shaders/assets/metal_floor.bbmodel diff --git a/26-advanced-data-glsl/assets/metal_floor.glb b/26-geometry-shaders/assets/metal_floor.glb similarity index 100% rename from 26-advanced-data-glsl/assets/metal_floor.glb rename to 26-geometry-shaders/assets/metal_floor.glb diff --git a/26-advanced-data-glsl/assets/popcorn_model_a.glb b/26-geometry-shaders/assets/popcorn_model_a.glb similarity index 100% rename from 26-advanced-data-glsl/assets/popcorn_model_a.glb rename to 26-geometry-shaders/assets/popcorn_model_a.glb diff --git a/26-advanced-data-glsl/assets/window.bbmodel b/26-geometry-shaders/assets/window.bbmodel similarity index 100% rename from 26-advanced-data-glsl/assets/window.bbmodel rename to 26-geometry-shaders/assets/window.bbmodel diff --git a/26-advanced-data-glsl/assets/window.glb b/26-geometry-shaders/assets/window.glb similarity index 100% rename from 26-advanced-data-glsl/assets/window.glb rename to 26-geometry-shaders/assets/window.glb diff --git a/26-advanced-data-glsl/backpack.zip b/26-geometry-shaders/backpack.zip similarity index 100% rename from 26-advanced-data-glsl/backpack.zip rename to 26-geometry-shaders/backpack.zip diff --git a/26-advanced-data-glsl/config.json b/26-geometry-shaders/config.json similarity index 100% rename from 26-advanced-data-glsl/config.json rename to 26-geometry-shaders/config.json diff --git a/26-advanced-data-glsl/meson.build b/26-geometry-shaders/meson.build similarity index 100% rename from 26-advanced-data-glsl/meson.build rename to 26-geometry-shaders/meson.build diff --git a/26-advanced-data-glsl/resources/textures/awesomeface.png b/26-geometry-shaders/resources/textures/awesomeface.png similarity index 100% rename from 26-advanced-data-glsl/resources/textures/awesomeface.png rename to 26-geometry-shaders/resources/textures/awesomeface.png diff --git a/26-advanced-data-glsl/resources/textures/container.jpg b/26-geometry-shaders/resources/textures/container.jpg similarity index 100% rename from 26-advanced-data-glsl/resources/textures/container.jpg rename to 26-geometry-shaders/resources/textures/container.jpg diff --git a/26-advanced-data-glsl/resources/textures/container2.png b/26-geometry-shaders/resources/textures/container2.png similarity index 100% rename from 26-advanced-data-glsl/resources/textures/container2.png rename to 26-geometry-shaders/resources/textures/container2.png diff --git a/26-advanced-data-glsl/resources/textures/container2_specular.png b/26-geometry-shaders/resources/textures/container2_specular.png similarity index 100% rename from 26-advanced-data-glsl/resources/textures/container2_specular.png rename to 26-geometry-shaders/resources/textures/container2_specular.png diff --git a/26-advanced-data-glsl/resources/textures/popcorn.jpg b/26-geometry-shaders/resources/textures/popcorn.jpg similarity index 100% rename from 26-advanced-data-glsl/resources/textures/popcorn.jpg rename to 26-geometry-shaders/resources/textures/popcorn.jpg diff --git a/26-advanced-data-glsl/scripts/reset_build.ps1 b/26-geometry-shaders/scripts/reset_build.ps1 similarity index 100% rename from 26-advanced-data-glsl/scripts/reset_build.ps1 rename to 26-geometry-shaders/scripts/reset_build.ps1 diff --git a/26-advanced-data-glsl/scripts/reset_build.sh b/26-geometry-shaders/scripts/reset_build.sh similarity index 100% rename from 26-advanced-data-glsl/scripts/reset_build.sh rename to 26-geometry-shaders/scripts/reset_build.sh diff --git a/26-advanced-data-glsl/scripts/setup.ps1 b/26-geometry-shaders/scripts/setup.ps1 similarity index 100% rename from 26-advanced-data-glsl/scripts/setup.ps1 rename to 26-geometry-shaders/scripts/setup.ps1 diff --git a/26-advanced-data-glsl/scripts/setup.sh b/26-geometry-shaders/scripts/setup.sh similarity index 100% rename from 26-advanced-data-glsl/scripts/setup.sh rename to 26-geometry-shaders/scripts/setup.sh diff --git a/26-advanced-data-glsl/scripts/watch_build.sh b/26-geometry-shaders/scripts/watch_build.sh similarity index 100% rename from 26-advanced-data-glsl/scripts/watch_build.sh rename to 26-geometry-shaders/scripts/watch_build.sh diff --git a/26-advanced-data-glsl/scripts/windows_setup.ps1 b/26-geometry-shaders/scripts/windows_setup.ps1 similarity index 100% rename from 26-advanced-data-glsl/scripts/windows_setup.ps1 rename to 26-geometry-shaders/scripts/windows_setup.ps1 diff --git a/26-advanced-data-glsl/shaders/08-frag.glsl b/26-geometry-shaders/shaders/08-frag.glsl similarity index 100% rename from 26-advanced-data-glsl/shaders/08-frag.glsl rename to 26-geometry-shaders/shaders/08-frag.glsl diff --git a/26-advanced-data-glsl/shaders/08-lightsource.frag.glsl b/26-geometry-shaders/shaders/08-lightsource.frag.glsl similarity index 100% rename from 26-advanced-data-glsl/shaders/08-lightsource.frag.glsl rename to 26-geometry-shaders/shaders/08-lightsource.frag.glsl diff --git a/26-advanced-data-glsl/shaders/08-vert.glsl b/26-geometry-shaders/shaders/08-vert.glsl similarity index 100% rename from 26-advanced-data-glsl/shaders/08-vert.glsl rename to 26-geometry-shaders/shaders/08-vert.glsl diff --git a/26-advanced-data-glsl/shaders/11-frag.glsl b/26-geometry-shaders/shaders/11-frag.glsl similarity index 100% rename from 26-advanced-data-glsl/shaders/11-frag.glsl rename to 26-geometry-shaders/shaders/11-frag.glsl diff --git a/26-advanced-data-glsl/shaders/11-lightsource.frag.glsl b/26-geometry-shaders/shaders/11-lightsource.frag.glsl similarity index 100% rename from 26-advanced-data-glsl/shaders/11-lightsource.frag.glsl rename to 26-geometry-shaders/shaders/11-lightsource.frag.glsl diff --git a/26-advanced-data-glsl/shaders/11-vert.glsl b/26-geometry-shaders/shaders/11-vert.glsl similarity index 100% rename from 26-advanced-data-glsl/shaders/11-vert.glsl rename to 26-geometry-shaders/shaders/11-vert.glsl diff --git a/26-advanced-data-glsl/shaders/12-frag.glsl b/26-geometry-shaders/shaders/12-frag.glsl similarity index 100% rename from 26-advanced-data-glsl/shaders/12-frag.glsl rename to 26-geometry-shaders/shaders/12-frag.glsl diff --git a/26-advanced-data-glsl/shaders/12-lightsource.frag.glsl b/26-geometry-shaders/shaders/12-lightsource.frag.glsl similarity index 100% rename from 26-advanced-data-glsl/shaders/12-lightsource.frag.glsl rename to 26-geometry-shaders/shaders/12-lightsource.frag.glsl diff --git a/26-advanced-data-glsl/shaders/12-vert.glsl b/26-geometry-shaders/shaders/12-vert.glsl similarity index 100% rename from 26-advanced-data-glsl/shaders/12-vert.glsl rename to 26-geometry-shaders/shaders/12-vert.glsl diff --git a/26-advanced-data-glsl/shaders/13-frag.glsl b/26-geometry-shaders/shaders/13-frag.glsl similarity index 100% rename from 26-advanced-data-glsl/shaders/13-frag.glsl rename to 26-geometry-shaders/shaders/13-frag.glsl diff --git a/26-advanced-data-glsl/shaders/13-lightsource.frag.glsl b/26-geometry-shaders/shaders/13-lightsource.frag.glsl similarity index 100% rename from 26-advanced-data-glsl/shaders/13-lightsource.frag.glsl rename to 26-geometry-shaders/shaders/13-lightsource.frag.glsl diff --git a/26-advanced-data-glsl/shaders/13-vert.glsl b/26-geometry-shaders/shaders/13-vert.glsl similarity index 100% rename from 26-advanced-data-glsl/shaders/13-vert.glsl rename to 26-geometry-shaders/shaders/13-vert.glsl diff --git a/26-advanced-data-glsl/shaders/14-frag.glsl b/26-geometry-shaders/shaders/14-frag.glsl similarity index 100% rename from 26-advanced-data-glsl/shaders/14-frag.glsl rename to 26-geometry-shaders/shaders/14-frag.glsl diff --git a/26-advanced-data-glsl/shaders/14-lightsource.frag.glsl b/26-geometry-shaders/shaders/14-lightsource.frag.glsl similarity index 100% rename from 26-advanced-data-glsl/shaders/14-lightsource.frag.glsl rename to 26-geometry-shaders/shaders/14-lightsource.frag.glsl diff --git a/26-advanced-data-glsl/shaders/14-vert.glsl b/26-geometry-shaders/shaders/14-vert.glsl similarity index 100% rename from 26-advanced-data-glsl/shaders/14-vert.glsl rename to 26-geometry-shaders/shaders/14-vert.glsl diff --git a/26-advanced-data-glsl/shaders/16-frag.glsl b/26-geometry-shaders/shaders/16-frag.glsl similarity index 100% rename from 26-advanced-data-glsl/shaders/16-frag.glsl rename to 26-geometry-shaders/shaders/16-frag.glsl diff --git a/26-advanced-data-glsl/shaders/16-lightsource.frag.glsl b/26-geometry-shaders/shaders/16-lightsource.frag.glsl similarity index 100% rename from 26-advanced-data-glsl/shaders/16-lightsource.frag.glsl rename to 26-geometry-shaders/shaders/16-lightsource.frag.glsl diff --git a/26-advanced-data-glsl/shaders/16-vert.glsl b/26-geometry-shaders/shaders/16-vert.glsl similarity index 100% rename from 26-advanced-data-glsl/shaders/16-vert.glsl rename to 26-geometry-shaders/shaders/16-vert.glsl diff --git a/26-advanced-data-glsl/shaders/17-frag.glsl b/26-geometry-shaders/shaders/17-frag.glsl similarity index 100% rename from 26-advanced-data-glsl/shaders/17-frag.glsl rename to 26-geometry-shaders/shaders/17-frag.glsl diff --git a/26-advanced-data-glsl/shaders/17-lightsource.frag.glsl b/26-geometry-shaders/shaders/17-lightsource.frag.glsl similarity index 100% rename from 26-advanced-data-glsl/shaders/17-lightsource.frag.glsl rename to 26-geometry-shaders/shaders/17-lightsource.frag.glsl diff --git a/26-advanced-data-glsl/shaders/17-vert.glsl b/26-geometry-shaders/shaders/17-vert.glsl similarity index 100% rename from 26-advanced-data-glsl/shaders/17-vert.glsl rename to 26-geometry-shaders/shaders/17-vert.glsl diff --git a/26-advanced-data-glsl/shaders/18-frag.glsl b/26-geometry-shaders/shaders/18-frag.glsl similarity index 100% rename from 26-advanced-data-glsl/shaders/18-frag.glsl rename to 26-geometry-shaders/shaders/18-frag.glsl diff --git a/26-advanced-data-glsl/shaders/18-lightsource.frag.glsl b/26-geometry-shaders/shaders/18-lightsource.frag.glsl similarity index 100% rename from 26-advanced-data-glsl/shaders/18-lightsource.frag.glsl rename to 26-geometry-shaders/shaders/18-lightsource.frag.glsl diff --git a/26-advanced-data-glsl/shaders/18-outline.glsl b/26-geometry-shaders/shaders/18-outline.glsl similarity index 100% rename from 26-advanced-data-glsl/shaders/18-outline.glsl rename to 26-geometry-shaders/shaders/18-outline.glsl diff --git a/26-advanced-data-glsl/shaders/18-vert.glsl b/26-geometry-shaders/shaders/18-vert.glsl similarity index 100% rename from 26-advanced-data-glsl/shaders/18-vert.glsl rename to 26-geometry-shaders/shaders/18-vert.glsl diff --git a/26-advanced-data-glsl/shaders/19-frag.glsl b/26-geometry-shaders/shaders/19-frag.glsl similarity index 100% rename from 26-advanced-data-glsl/shaders/19-frag.glsl rename to 26-geometry-shaders/shaders/19-frag.glsl diff --git a/26-advanced-data-glsl/shaders/19-lightsource.frag.glsl b/26-geometry-shaders/shaders/19-lightsource.frag.glsl similarity index 100% rename from 26-advanced-data-glsl/shaders/19-lightsource.frag.glsl rename to 26-geometry-shaders/shaders/19-lightsource.frag.glsl diff --git a/26-advanced-data-glsl/shaders/19-vert.glsl b/26-geometry-shaders/shaders/19-vert.glsl similarity index 100% rename from 26-advanced-data-glsl/shaders/19-vert.glsl rename to 26-geometry-shaders/shaders/19-vert.glsl diff --git a/26-advanced-data-glsl/shaders/21-framebuffers.frag.glsl b/26-geometry-shaders/shaders/21-framebuffers.frag.glsl similarity index 100% rename from 26-advanced-data-glsl/shaders/21-framebuffers.frag.glsl rename to 26-geometry-shaders/shaders/21-framebuffers.frag.glsl diff --git a/26-advanced-data-glsl/shaders/21-framebuffers.vert.glsl b/26-geometry-shaders/shaders/21-framebuffers.vert.glsl similarity index 100% rename from 26-advanced-data-glsl/shaders/21-framebuffers.vert.glsl rename to 26-geometry-shaders/shaders/21-framebuffers.vert.glsl diff --git a/26-advanced-data-glsl/shaders/21-screen-kernel.frag.glsl b/26-geometry-shaders/shaders/21-screen-kernel.frag.glsl similarity index 100% rename from 26-advanced-data-glsl/shaders/21-screen-kernel.frag.glsl rename to 26-geometry-shaders/shaders/21-screen-kernel.frag.glsl diff --git a/26-advanced-data-glsl/shaders/21-screen.frag.glsl b/26-geometry-shaders/shaders/21-screen.frag.glsl similarity index 100% rename from 26-advanced-data-glsl/shaders/21-screen.frag.glsl rename to 26-geometry-shaders/shaders/21-screen.frag.glsl diff --git a/26-advanced-data-glsl/shaders/21-screen.vert.glsl b/26-geometry-shaders/shaders/21-screen.vert.glsl similarity index 100% rename from 26-advanced-data-glsl/shaders/21-screen.vert.glsl rename to 26-geometry-shaders/shaders/21-screen.vert.glsl diff --git a/26-advanced-data-glsl/shaders/24-frag.glsl b/26-geometry-shaders/shaders/24-frag.glsl similarity index 100% rename from 26-advanced-data-glsl/shaders/24-frag.glsl rename to 26-geometry-shaders/shaders/24-frag.glsl diff --git a/26-advanced-data-glsl/shaders/24-skybox.frag.glsl b/26-geometry-shaders/shaders/24-skybox.frag.glsl similarity index 100% rename from 26-advanced-data-glsl/shaders/24-skybox.frag.glsl rename to 26-geometry-shaders/shaders/24-skybox.frag.glsl diff --git a/26-advanced-data-glsl/shaders/24-skybox.vert.glsl b/26-geometry-shaders/shaders/24-skybox.vert.glsl similarity index 100% rename from 26-advanced-data-glsl/shaders/24-skybox.vert.glsl rename to 26-geometry-shaders/shaders/24-skybox.vert.glsl diff --git a/26-advanced-data-glsl/shaders/24-vert.glsl b/26-geometry-shaders/shaders/24-vert.glsl similarity index 100% rename from 26-advanced-data-glsl/shaders/24-vert.glsl rename to 26-geometry-shaders/shaders/24-vert.glsl diff --git a/26-advanced-data-glsl/shaders/3.3.shader.fs b/26-geometry-shaders/shaders/3.3.shader.fs similarity index 100% rename from 26-advanced-data-glsl/shaders/3.3.shader.fs rename to 26-geometry-shaders/shaders/3.3.shader.fs diff --git a/26-advanced-data-glsl/shaders/3.3.shader.vs b/26-geometry-shaders/shaders/3.3.shader.vs similarity index 100% rename from 26-advanced-data-glsl/shaders/3.3.shader.vs rename to 26-geometry-shaders/shaders/3.3.shader.vs diff --git a/26-advanced-data-glsl/shaders/4.2.texture.fs b/26-geometry-shaders/shaders/4.2.texture.fs similarity index 100% rename from 26-advanced-data-glsl/shaders/4.2.texture.fs rename to 26-geometry-shaders/shaders/4.2.texture.fs diff --git a/26-advanced-data-glsl/shaders/4.2.texture.vs b/26-geometry-shaders/shaders/4.2.texture.vs similarity index 100% rename from 26-advanced-data-glsl/shaders/4.2.texture.vs rename to 26-geometry-shaders/shaders/4.2.texture.vs diff --git a/26-advanced-data-glsl/src/KHR/khrplatform.h b/26-geometry-shaders/src/KHR/khrplatform.h similarity index 100% rename from 26-advanced-data-glsl/src/KHR/khrplatform.h rename to 26-geometry-shaders/src/KHR/khrplatform.h diff --git a/26-advanced-data-glsl/src/camera.cpp b/26-geometry-shaders/src/camera.cpp similarity index 100% rename from 26-advanced-data-glsl/src/camera.cpp rename to 26-geometry-shaders/src/camera.cpp diff --git a/26-advanced-data-glsl/src/camera.hpp b/26-geometry-shaders/src/camera.hpp similarity index 100% rename from 26-advanced-data-glsl/src/camera.hpp rename to 26-geometry-shaders/src/camera.hpp diff --git a/26-advanced-data-glsl/src/components.hpp b/26-geometry-shaders/src/components.hpp similarity index 100% rename from 26-advanced-data-glsl/src/components.hpp rename to 26-geometry-shaders/src/components.hpp diff --git a/26-advanced-data-glsl/src/dbc.cpp b/26-geometry-shaders/src/dbc.cpp similarity index 100% rename from 26-advanced-data-glsl/src/dbc.cpp rename to 26-geometry-shaders/src/dbc.cpp diff --git a/26-advanced-data-glsl/src/dbc.hpp b/26-geometry-shaders/src/dbc.hpp similarity index 100% rename from 26-advanced-data-glsl/src/dbc.hpp rename to 26-geometry-shaders/src/dbc.hpp diff --git a/26-advanced-data-glsl/src/framebuffer.cpp b/26-geometry-shaders/src/framebuffer.cpp similarity index 100% rename from 26-advanced-data-glsl/src/framebuffer.cpp rename to 26-geometry-shaders/src/framebuffer.cpp diff --git a/26-advanced-data-glsl/src/framebuffer.hpp b/26-geometry-shaders/src/framebuffer.hpp similarity index 100% rename from 26-advanced-data-glsl/src/framebuffer.hpp rename to 26-geometry-shaders/src/framebuffer.hpp diff --git a/26-advanced-data-glsl/src/glad/glad.cpp b/26-geometry-shaders/src/glad/glad.cpp similarity index 100% rename from 26-advanced-data-glsl/src/glad/glad.cpp rename to 26-geometry-shaders/src/glad/glad.cpp diff --git a/26-advanced-data-glsl/src/glad/glad.h b/26-geometry-shaders/src/glad/glad.h similarity index 100% rename from 26-advanced-data-glsl/src/glad/glad.h rename to 26-geometry-shaders/src/glad/glad.h diff --git a/26-advanced-data-glsl/src/json.hpp b/26-geometry-shaders/src/json.hpp similarity index 100% rename from 26-advanced-data-glsl/src/json.hpp rename to 26-geometry-shaders/src/json.hpp diff --git a/26-advanced-data-glsl/src/main.cpp b/26-geometry-shaders/src/main.cpp similarity index 100% rename from 26-advanced-data-glsl/src/main.cpp rename to 26-geometry-shaders/src/main.cpp diff --git a/26-advanced-data-glsl/src/mesh.cpp b/26-geometry-shaders/src/mesh.cpp similarity index 100% rename from 26-advanced-data-glsl/src/mesh.cpp rename to 26-geometry-shaders/src/mesh.cpp diff --git a/26-advanced-data-glsl/src/mesh.hpp b/26-geometry-shaders/src/mesh.hpp similarity index 100% rename from 26-advanced-data-glsl/src/mesh.hpp rename to 26-geometry-shaders/src/mesh.hpp diff --git a/26-advanced-data-glsl/src/model.cpp b/26-geometry-shaders/src/model.cpp similarity index 100% rename from 26-advanced-data-glsl/src/model.cpp rename to 26-geometry-shaders/src/model.cpp diff --git a/26-advanced-data-glsl/src/model.hpp b/26-geometry-shaders/src/model.hpp similarity index 100% rename from 26-advanced-data-glsl/src/model.hpp rename to 26-geometry-shaders/src/model.hpp diff --git a/26-advanced-data-glsl/src/scene.cpp b/26-geometry-shaders/src/scene.cpp similarity index 100% rename from 26-advanced-data-glsl/src/scene.cpp rename to 26-geometry-shaders/src/scene.cpp diff --git a/26-advanced-data-glsl/src/scene.hpp b/26-geometry-shaders/src/scene.hpp similarity index 100% rename from 26-advanced-data-glsl/src/scene.hpp rename to 26-geometry-shaders/src/scene.hpp diff --git a/26-advanced-data-glsl/src/screen.cpp b/26-geometry-shaders/src/screen.cpp similarity index 100% rename from 26-advanced-data-glsl/src/screen.cpp rename to 26-geometry-shaders/src/screen.cpp diff --git a/26-advanced-data-glsl/src/screen.hpp b/26-geometry-shaders/src/screen.hpp similarity index 100% rename from 26-advanced-data-glsl/src/screen.hpp rename to 26-geometry-shaders/src/screen.hpp diff --git a/26-advanced-data-glsl/src/shader.cpp b/26-geometry-shaders/src/shader.cpp similarity index 100% rename from 26-advanced-data-glsl/src/shader.cpp rename to 26-geometry-shaders/src/shader.cpp diff --git a/26-advanced-data-glsl/src/shader.hpp b/26-geometry-shaders/src/shader.hpp similarity index 100% rename from 26-advanced-data-glsl/src/shader.hpp rename to 26-geometry-shaders/src/shader.hpp diff --git a/26-advanced-data-glsl/src/skybox.hpp b/26-geometry-shaders/src/skybox.hpp similarity index 100% rename from 26-advanced-data-glsl/src/skybox.hpp rename to 26-geometry-shaders/src/skybox.hpp diff --git a/26-advanced-data-glsl/src/stb_image.cpp b/26-geometry-shaders/src/stb_image.cpp similarity index 100% rename from 26-advanced-data-glsl/src/stb_image.cpp rename to 26-geometry-shaders/src/stb_image.cpp diff --git a/26-advanced-data-glsl/src/stb_image.h b/26-geometry-shaders/src/stb_image.h similarity index 100% rename from 26-advanced-data-glsl/src/stb_image.h rename to 26-geometry-shaders/src/stb_image.h diff --git a/26-advanced-data-glsl/src/utils.cpp b/26-geometry-shaders/src/utils.cpp similarity index 100% rename from 26-advanced-data-glsl/src/utils.cpp rename to 26-geometry-shaders/src/utils.cpp diff --git a/26-advanced-data-glsl/src/utils.hpp b/26-geometry-shaders/src/utils.hpp similarity index 100% rename from 26-advanced-data-glsl/src/utils.hpp rename to 26-geometry-shaders/src/utils.hpp diff --git a/26-advanced-data-glsl/tests/bad_shader.vs b/26-geometry-shaders/tests/bad_shader.vs similarity index 100% rename from 26-advanced-data-glsl/tests/bad_shader.vs rename to 26-geometry-shaders/tests/bad_shader.vs diff --git a/26-advanced-data-glsl/tests/config.json b/26-geometry-shaders/tests/config.json similarity index 100% rename from 26-advanced-data-glsl/tests/config.json rename to 26-geometry-shaders/tests/config.json diff --git a/26-advanced-data-glsl/tests/config_tests.cpp b/26-geometry-shaders/tests/config_tests.cpp similarity index 100% rename from 26-advanced-data-glsl/tests/config_tests.cpp rename to 26-geometry-shaders/tests/config_tests.cpp diff --git a/26-advanced-data-glsl/tests/main.cpp b/26-geometry-shaders/tests/main.cpp similarity index 100% rename from 26-advanced-data-glsl/tests/main.cpp rename to 26-geometry-shaders/tests/main.cpp diff --git a/26-advanced-data-glsl/tests/meson.build b/26-geometry-shaders/tests/meson.build similarity index 100% rename from 26-advanced-data-glsl/tests/meson.build rename to 26-geometry-shaders/tests/meson.build diff --git a/26-advanced-data-glsl/tests/model_tests.cpp b/26-geometry-shaders/tests/model_tests.cpp similarity index 100% rename from 26-advanced-data-glsl/tests/model_tests.cpp rename to 26-geometry-shaders/tests/model_tests.cpp diff --git a/26-advanced-data-glsl/tests/shader_tests.cpp b/26-geometry-shaders/tests/shader_tests.cpp similarity index 100% rename from 26-advanced-data-glsl/tests/shader_tests.cpp rename to 26-geometry-shaders/tests/shader_tests.cpp diff --git a/26-advanced-data-glsl/wraps/assimp.wrap b/26-geometry-shaders/wraps/assimp.wrap similarity index 100% rename from 26-advanced-data-glsl/wraps/assimp.wrap rename to 26-geometry-shaders/wraps/assimp.wrap diff --git a/26-advanced-data-glsl/wraps/box2d.wrap b/26-geometry-shaders/wraps/box2d.wrap similarity index 100% rename from 26-advanced-data-glsl/wraps/box2d.wrap rename to 26-geometry-shaders/wraps/box2d.wrap diff --git a/26-advanced-data-glsl/wraps/fmt.wrap b/26-geometry-shaders/wraps/fmt.wrap similarity index 100% rename from 26-advanced-data-glsl/wraps/fmt.wrap rename to 26-geometry-shaders/wraps/fmt.wrap diff --git a/26-advanced-data-glsl/wraps/fuc2.wrap b/26-geometry-shaders/wraps/fuc2.wrap similarity index 100% rename from 26-advanced-data-glsl/wraps/fuc2.wrap rename to 26-geometry-shaders/wraps/fuc2.wrap diff --git a/26-advanced-data-glsl/wraps/glfw.wrap b/26-geometry-shaders/wraps/glfw.wrap similarity index 100% rename from 26-advanced-data-glsl/wraps/glfw.wrap rename to 26-geometry-shaders/wraps/glfw.wrap diff --git a/26-advanced-data-glsl/wraps/glm.wrap b/26-geometry-shaders/wraps/glm.wrap similarity index 100% rename from 26-advanced-data-glsl/wraps/glm.wrap rename to 26-geometry-shaders/wraps/glm.wrap diff --git a/26-advanced-data-glsl/wraps/nlohmann_json.wrap b/26-geometry-shaders/wraps/nlohmann_json.wrap similarity index 100% rename from 26-advanced-data-glsl/wraps/nlohmann_json.wrap rename to 26-geometry-shaders/wraps/nlohmann_json.wrap