From 780ba8df2a9520ad02ac6b7838702e87c534b6e3 Mon Sep 17 00:00:00 2001 From: Valerie Date: Mon, 15 Apr 2024 17:20:57 -0400 Subject: [PATCH] changed world curvature to be exclusive rather than inclusive --- shaders/gbuffers_basic.vsh | 2 +- shaders/{gbuffers_entities.fsh => gbuffers_clouds.fsh} | 0 shaders/{gbuffers_entities.vsh => gbuffers_clouds.vsh} | 2 +- shaders/{gbuffers_terrain.fsh => gbuffers_skybasic.fsh} | 0 shaders/{gbuffers_terrain.vsh => gbuffers_skybasic.vsh} | 2 +- shaders/gbuffers_skytextured.fsh | 1 + shaders/gbuffers_skytextured.vsh | 2 ++ 7 files changed, 6 insertions(+), 3 deletions(-) rename shaders/{gbuffers_entities.fsh => gbuffers_clouds.fsh} (100%) rename shaders/{gbuffers_entities.vsh => gbuffers_clouds.vsh} (63%) rename shaders/{gbuffers_terrain.fsh => gbuffers_skybasic.fsh} (100%) rename shaders/{gbuffers_terrain.vsh => gbuffers_skybasic.vsh} (63%) create mode 100644 shaders/gbuffers_skytextured.fsh create mode 100644 shaders/gbuffers_skytextured.vsh diff --git a/shaders/gbuffers_basic.vsh b/shaders/gbuffers_basic.vsh index 11e87ab..1952a0f 100644 --- a/shaders/gbuffers_basic.vsh +++ b/shaders/gbuffers_basic.vsh @@ -29,7 +29,7 @@ void main() { texture_warp(); #endif - #ifdef WORLD + #ifndef NON_WORLD #include "/module/world.vert" #endif } diff --git a/shaders/gbuffers_entities.fsh b/shaders/gbuffers_clouds.fsh similarity index 100% rename from shaders/gbuffers_entities.fsh rename to shaders/gbuffers_clouds.fsh diff --git a/shaders/gbuffers_entities.vsh b/shaders/gbuffers_clouds.vsh similarity index 63% rename from shaders/gbuffers_entities.vsh rename to shaders/gbuffers_clouds.vsh index e08a961..1a1eb4d 100644 --- a/shaders/gbuffers_entities.vsh +++ b/shaders/gbuffers_clouds.vsh @@ -1,2 +1,2 @@ -#define WORLD +#define NON_WORLD #include "/gbuffers_basic.vsh" diff --git a/shaders/gbuffers_terrain.fsh b/shaders/gbuffers_skybasic.fsh similarity index 100% rename from shaders/gbuffers_terrain.fsh rename to shaders/gbuffers_skybasic.fsh diff --git a/shaders/gbuffers_terrain.vsh b/shaders/gbuffers_skybasic.vsh similarity index 63% rename from shaders/gbuffers_terrain.vsh rename to shaders/gbuffers_skybasic.vsh index e08a961..1a1eb4d 100644 --- a/shaders/gbuffers_terrain.vsh +++ b/shaders/gbuffers_skybasic.vsh @@ -1,2 +1,2 @@ -#define WORLD +#define NON_WORLD #include "/gbuffers_basic.vsh" diff --git a/shaders/gbuffers_skytextured.fsh b/shaders/gbuffers_skytextured.fsh new file mode 100644 index 0000000..74dd3ca --- /dev/null +++ b/shaders/gbuffers_skytextured.fsh @@ -0,0 +1 @@ +#include "/gbuffers_basic.fsh" diff --git a/shaders/gbuffers_skytextured.vsh b/shaders/gbuffers_skytextured.vsh new file mode 100644 index 0000000..1a1eb4d --- /dev/null +++ b/shaders/gbuffers_skytextured.vsh @@ -0,0 +1,2 @@ +#define NON_WORLD +#include "/gbuffers_basic.vsh"