From ff8fb0f0faa32e56f9aa6dbe6e6eb508ffb8da26 Mon Sep 17 00:00:00 2001 From: luboslenco Date: Tue, 21 Feb 2023 14:06:58 +0100 Subject: [PATCH] Folder structure cleanup --- armorlab/khafile.js | 7 +++---- armorpaint/khafile.js | 7 +++---- base/Assets/{common => }/World_irradiance.arm | Bin base/Assets/{common => }/World_radiance.hdr | Bin base/Assets/{common => }/World_radiance_0.hdr | Bin base/Assets/{common => }/World_radiance_1.hdr | Bin base/Assets/{common => }/World_radiance_2.hdr | Bin base/Assets/{common => }/World_radiance_3.hdr | Bin base/Assets/{common => }/World_radiance_4.hdr | Bin base/Assets/{common => }/World_radiance_5.hdr | Bin base/Assets/{common => }/World_radiance_6.hdr | 0 base/Assets/{common => }/World_radiance_7.hdr | 0 base/Assets/{common => }/World_radiance_8.hdr | 0 base/Assets/{common => }/brdf.png | Bin base/Assets/{common => }/color_wheel.png | Bin base/Assets/{common => }/color_wheel_gradient.png | Bin base/Assets/{common => }/cursor.png | Bin base/Assets/{common => }/extra/font_cjk.ttc | Bin base/Assets/{common => }/font.ttf | Bin base/Assets/{common => }/font13.bin | Bin base/Assets/{common => }/font_mono.ttf | Bin base/Assets/{common => }/ltc_mag.arm | Bin base/Assets/{common => }/ltc_mat.arm | Bin base/Assets/{common => }/noise256.png | Bin base/Assets/{common => }/shader_datas.arm | Bin base/Assets/{common => }/smaa_area.png | Bin base/Assets/{common => }/smaa_search.png | Bin base/Assets/{common => }/text_coloring.json | 0 .../{common => }/bloom_downsample_pass.frag.glsl | 0 .../{common => }/bloom_upsample_pass.frag.glsl | 0 base/Shaders/common/deferred_light.frag.glsl | 3 --- base/Shaders/common/deferred_light_voxel.frag.glsl | 4 ---- base/Shaders/{common => }/compositor_pass.frag.glsl | 0 base/Shaders/{common => }/copy_mrt3_pass.frag.glsl | 0 base/Shaders/{common => }/cursor.frag.glsl | 0 base/Shaders/{common => }/cursor.vert.glsl | 0 base/Shaders/deferred_light.frag.glsl | 3 +++ base/Shaders/deferred_light_voxel.frag.glsl | 4 ++++ base/Shaders/{common => }/histogram_pass.frag.glsl | 0 base/Shaders/{shared => }/layer_copy.frag.glsl | 0 base/Shaders/{shared => }/layer_copy_bgra.frag.glsl | 0 base/Shaders/{shared => }/layer_view.vert.glsl | 0 base/Shaders/{common => }/line.frag.glsl | 0 base/Shaders/{common => }/line.vert.glsl | 0 base/Shaders/{shared => }/mask_apply.frag.glsl | 0 base/Shaders/{common => }/mesh_poscol.frag.glsl | 0 base/Shaders/{common => }/mesh_poscol.vert.glsl | 0 base/Shaders/{shared => }/mesh_posnortex.frag.glsl | 2 +- base/Shaders/{shared => }/mesh_posnortex.vert.glsl | 0 base/Shaders/{common => }/pass.vert.glsl | 0 base/Shaders/{common => }/pass_copy.frag.glsl | 0 base/Shaders/{common => }/pass_viewray.vert.glsl | 0 base/Shaders/{common => }/pass_viewray2.vert.glsl | 0 .../Shaders/{common => }/prefilter_envmap.frag.glsl | 0 .../{common => }/smaa_blend_weight.frag.glsl | 0 .../{common => }/smaa_blend_weight.vert.glsl | 0 .../Shaders/{common => }/smaa_edge_detect.frag.glsl | 0 .../Shaders/{common => }/smaa_edge_detect.vert.glsl | 0 .../{common => }/smaa_neighborhood_blend.frag.glsl | 0 .../{common => }/smaa_neighborhood_blend.vert.glsl | 0 base/Shaders/{common => }/ssao_blur_pass.frag.glsl | 2 +- base/Shaders/{common => }/ssao_pass.frag.glsl | 4 ++-- base/Shaders/{common => }/ssr_blur_pass.frag.glsl | 2 +- base/Shaders/{common => }/ssr_pass.frag.glsl | 4 ++-- base/Shaders/std/deferred_light.glsl | 8 ++++---- base/Shaders/std/light.glsl | 8 ++++---- .../{common => }/supersample_resolve.frag.glsl | 0 base/Shaders/{common => }/taa_pass.frag.glsl | 0 base/Shaders/voxel_glsl/voxel_pos.frag.glsl | 2 +- base/Shaders/voxel_glsl/voxel_pos.vert.glsl | 2 +- base/Shaders/{common => }/world_pass.frag.glsl | 2 +- base/Shaders/{common => }/world_pass.vert.glsl | 0 72 files changed, 31 insertions(+), 33 deletions(-) rename base/Assets/{common => }/World_irradiance.arm (100%) rename base/Assets/{common => }/World_radiance.hdr (100%) rename base/Assets/{common => }/World_radiance_0.hdr (100%) rename base/Assets/{common => }/World_radiance_1.hdr (100%) rename base/Assets/{common => }/World_radiance_2.hdr (100%) rename base/Assets/{common => }/World_radiance_3.hdr (100%) rename base/Assets/{common => }/World_radiance_4.hdr (100%) rename base/Assets/{common => }/World_radiance_5.hdr (100%) rename base/Assets/{common => }/World_radiance_6.hdr (100%) rename base/Assets/{common => }/World_radiance_7.hdr (100%) rename base/Assets/{common => }/World_radiance_8.hdr (100%) rename base/Assets/{common => }/brdf.png (100%) rename base/Assets/{common => }/color_wheel.png (100%) rename base/Assets/{common => }/color_wheel_gradient.png (100%) rename base/Assets/{common => }/cursor.png (100%) rename base/Assets/{common => }/extra/font_cjk.ttc (100%) rename base/Assets/{common => }/font.ttf (100%) rename base/Assets/{common => }/font13.bin (100%) rename base/Assets/{common => }/font_mono.ttf (100%) rename base/Assets/{common => }/ltc_mag.arm (100%) rename base/Assets/{common => }/ltc_mat.arm (100%) rename base/Assets/{common => }/noise256.png (100%) rename base/Assets/{common => }/shader_datas.arm (100%) rename base/Assets/{common => }/smaa_area.png (100%) rename base/Assets/{common => }/smaa_search.png (100%) rename base/Assets/{common => }/text_coloring.json (100%) rename base/Shaders/{common => }/bloom_downsample_pass.frag.glsl (100%) rename base/Shaders/{common => }/bloom_upsample_pass.frag.glsl (100%) delete mode 100644 base/Shaders/common/deferred_light.frag.glsl delete mode 100644 base/Shaders/common/deferred_light_voxel.frag.glsl rename base/Shaders/{common => }/compositor_pass.frag.glsl (100%) rename base/Shaders/{common => }/copy_mrt3_pass.frag.glsl (100%) rename base/Shaders/{common => }/cursor.frag.glsl (100%) rename base/Shaders/{common => }/cursor.vert.glsl (100%) create mode 100644 base/Shaders/deferred_light.frag.glsl create mode 100644 base/Shaders/deferred_light_voxel.frag.glsl rename base/Shaders/{common => }/histogram_pass.frag.glsl (100%) rename base/Shaders/{shared => }/layer_copy.frag.glsl (100%) rename base/Shaders/{shared => }/layer_copy_bgra.frag.glsl (100%) rename base/Shaders/{shared => }/layer_view.vert.glsl (100%) rename base/Shaders/{common => }/line.frag.glsl (100%) rename base/Shaders/{common => }/line.vert.glsl (100%) rename base/Shaders/{shared => }/mask_apply.frag.glsl (100%) rename base/Shaders/{common => }/mesh_poscol.frag.glsl (100%) rename base/Shaders/{common => }/mesh_poscol.vert.glsl (100%) rename base/Shaders/{shared => }/mesh_posnortex.frag.glsl (95%) rename base/Shaders/{shared => }/mesh_posnortex.vert.glsl (100%) rename base/Shaders/{common => }/pass.vert.glsl (100%) rename base/Shaders/{common => }/pass_copy.frag.glsl (100%) rename base/Shaders/{common => }/pass_viewray.vert.glsl (100%) rename base/Shaders/{common => }/pass_viewray2.vert.glsl (100%) rename base/Shaders/{common => }/prefilter_envmap.frag.glsl (100%) rename base/Shaders/{common => }/smaa_blend_weight.frag.glsl (100%) rename base/Shaders/{common => }/smaa_blend_weight.vert.glsl (100%) rename base/Shaders/{common => }/smaa_edge_detect.frag.glsl (100%) rename base/Shaders/{common => }/smaa_edge_detect.vert.glsl (100%) rename base/Shaders/{common => }/smaa_neighborhood_blend.frag.glsl (100%) rename base/Shaders/{common => }/smaa_neighborhood_blend.vert.glsl (100%) rename base/Shaders/{common => }/ssao_blur_pass.frag.glsl (97%) rename base/Shaders/{common => }/ssao_pass.frag.glsl (97%) rename base/Shaders/{common => }/ssr_blur_pass.frag.glsl (95%) rename base/Shaders/{common => }/ssr_pass.frag.glsl (97%) rename base/Shaders/{common => }/supersample_resolve.frag.glsl (100%) rename base/Shaders/{common => }/taa_pass.frag.glsl (100%) rename base/Shaders/{common => }/world_pass.frag.glsl (93%) rename base/Shaders/{common => }/world_pass.vert.glsl (100%) diff --git a/armorlab/khafile.js b/armorlab/khafile.js index 280ae5b3..095b1348 100644 --- a/armorlab/khafile.js +++ b/armorlab/khafile.js @@ -18,12 +18,11 @@ project.addLibrary("../../Libraries/iron"); project.addLibrary("../../Libraries/zui"); project.addLibrary("../../base"); project.addShaders("../armorcore/Shaders/*.glsl", { embed: snapshot }); -project.addShaders("../base/Shaders/common/*.glsl", { embed: snapshot }); -project.addShaders("../base/Shaders/shared/*.glsl", { embed: snapshot }); -project.addAssets("../base/Assets/common/*", { destination: "data/{name}", embed: snapshot }); +project.addShaders("../base/Shaders/*.glsl", { embed: snapshot }); +project.addAssets("../base/Assets/*", { destination: "data/{name}", embed: snapshot }); if (!snapshot) { project.addDefine("arm_noembed"); - project.addAssets("../base/Assets/common/extra/*", { destination: "data/{name}" }); + project.addAssets("../base/Assets/extra/*", { destination: "data/{name}" }); } project.addAssets("Assets/export_presets/*", { destination: "data/export_presets/{name}" }); project.addAssets("Assets/keymap_presets/*", { destination: "data/keymap_presets/{name}" }); diff --git a/armorpaint/khafile.js b/armorpaint/khafile.js index 010a7f33..ecf7de2f 100644 --- a/armorpaint/khafile.js +++ b/armorpaint/khafile.js @@ -20,12 +20,11 @@ project.addLibrary("../../Libraries/iron"); project.addLibrary("../../Libraries/zui"); project.addLibrary("../../base"); project.addShaders("../armorcore/Shaders/*.glsl", { embed: snapshot }); -project.addShaders("../base/Shaders/common/*.glsl", { embed: snapshot }); -project.addShaders("../base/Shaders/shared/*.glsl", { embed: snapshot }); -project.addAssets("../base/Assets/common/*", { destination: "data/{name}", embed: snapshot }); +project.addShaders("../base/Shaders/*.glsl", { embed: snapshot }); +project.addAssets("../base/Assets/*", { destination: "data/{name}", embed: snapshot }); if (!snapshot) { project.addDefine("arm_noembed"); - project.addAssets("../base/Assets/common/extra/*", { destination: "data/{name}" }); + project.addAssets("../base/Assets/extra/*", { destination: "data/{name}" }); } project.addAssets("Assets/export_presets/*", { destination: "data/export_presets/{name}" }); project.addAssets("Assets/keymap_presets/*", { destination: "data/keymap_presets/{name}" }); diff --git a/base/Assets/common/World_irradiance.arm b/base/Assets/World_irradiance.arm similarity index 100% rename from base/Assets/common/World_irradiance.arm rename to base/Assets/World_irradiance.arm diff --git a/base/Assets/common/World_radiance.hdr b/base/Assets/World_radiance.hdr similarity index 100% rename from base/Assets/common/World_radiance.hdr rename to base/Assets/World_radiance.hdr diff --git a/base/Assets/common/World_radiance_0.hdr b/base/Assets/World_radiance_0.hdr similarity index 100% rename from base/Assets/common/World_radiance_0.hdr rename to base/Assets/World_radiance_0.hdr diff --git a/base/Assets/common/World_radiance_1.hdr b/base/Assets/World_radiance_1.hdr similarity index 100% rename from base/Assets/common/World_radiance_1.hdr rename to base/Assets/World_radiance_1.hdr diff --git a/base/Assets/common/World_radiance_2.hdr b/base/Assets/World_radiance_2.hdr similarity index 100% rename from base/Assets/common/World_radiance_2.hdr rename to base/Assets/World_radiance_2.hdr diff --git a/base/Assets/common/World_radiance_3.hdr b/base/Assets/World_radiance_3.hdr similarity index 100% rename from base/Assets/common/World_radiance_3.hdr rename to base/Assets/World_radiance_3.hdr diff --git a/base/Assets/common/World_radiance_4.hdr b/base/Assets/World_radiance_4.hdr similarity index 100% rename from base/Assets/common/World_radiance_4.hdr rename to base/Assets/World_radiance_4.hdr diff --git a/base/Assets/common/World_radiance_5.hdr b/base/Assets/World_radiance_5.hdr similarity index 100% rename from base/Assets/common/World_radiance_5.hdr rename to base/Assets/World_radiance_5.hdr diff --git a/base/Assets/common/World_radiance_6.hdr b/base/Assets/World_radiance_6.hdr similarity index 100% rename from base/Assets/common/World_radiance_6.hdr rename to base/Assets/World_radiance_6.hdr diff --git a/base/Assets/common/World_radiance_7.hdr b/base/Assets/World_radiance_7.hdr similarity index 100% rename from base/Assets/common/World_radiance_7.hdr rename to base/Assets/World_radiance_7.hdr diff --git a/base/Assets/common/World_radiance_8.hdr b/base/Assets/World_radiance_8.hdr similarity index 100% rename from base/Assets/common/World_radiance_8.hdr rename to base/Assets/World_radiance_8.hdr diff --git a/base/Assets/common/brdf.png b/base/Assets/brdf.png similarity index 100% rename from base/Assets/common/brdf.png rename to base/Assets/brdf.png diff --git a/base/Assets/common/color_wheel.png b/base/Assets/color_wheel.png similarity index 100% rename from base/Assets/common/color_wheel.png rename to base/Assets/color_wheel.png diff --git a/base/Assets/common/color_wheel_gradient.png b/base/Assets/color_wheel_gradient.png similarity index 100% rename from base/Assets/common/color_wheel_gradient.png rename to base/Assets/color_wheel_gradient.png diff --git a/base/Assets/common/cursor.png b/base/Assets/cursor.png similarity index 100% rename from base/Assets/common/cursor.png rename to base/Assets/cursor.png diff --git a/base/Assets/common/extra/font_cjk.ttc b/base/Assets/extra/font_cjk.ttc similarity index 100% rename from base/Assets/common/extra/font_cjk.ttc rename to base/Assets/extra/font_cjk.ttc diff --git a/base/Assets/common/font.ttf b/base/Assets/font.ttf similarity index 100% rename from base/Assets/common/font.ttf rename to base/Assets/font.ttf diff --git a/base/Assets/common/font13.bin b/base/Assets/font13.bin similarity index 100% rename from base/Assets/common/font13.bin rename to base/Assets/font13.bin diff --git a/base/Assets/common/font_mono.ttf b/base/Assets/font_mono.ttf similarity index 100% rename from base/Assets/common/font_mono.ttf rename to base/Assets/font_mono.ttf diff --git a/base/Assets/common/ltc_mag.arm b/base/Assets/ltc_mag.arm similarity index 100% rename from base/Assets/common/ltc_mag.arm rename to base/Assets/ltc_mag.arm diff --git a/base/Assets/common/ltc_mat.arm b/base/Assets/ltc_mat.arm similarity index 100% rename from base/Assets/common/ltc_mat.arm rename to base/Assets/ltc_mat.arm diff --git a/base/Assets/common/noise256.png b/base/Assets/noise256.png similarity index 100% rename from base/Assets/common/noise256.png rename to base/Assets/noise256.png diff --git a/base/Assets/common/shader_datas.arm b/base/Assets/shader_datas.arm similarity index 100% rename from base/Assets/common/shader_datas.arm rename to base/Assets/shader_datas.arm diff --git a/base/Assets/common/smaa_area.png b/base/Assets/smaa_area.png similarity index 100% rename from base/Assets/common/smaa_area.png rename to base/Assets/smaa_area.png diff --git a/base/Assets/common/smaa_search.png b/base/Assets/smaa_search.png similarity index 100% rename from base/Assets/common/smaa_search.png rename to base/Assets/smaa_search.png diff --git a/base/Assets/common/text_coloring.json b/base/Assets/text_coloring.json similarity index 100% rename from base/Assets/common/text_coloring.json rename to base/Assets/text_coloring.json diff --git a/base/Shaders/common/bloom_downsample_pass.frag.glsl b/base/Shaders/bloom_downsample_pass.frag.glsl similarity index 100% rename from base/Shaders/common/bloom_downsample_pass.frag.glsl rename to base/Shaders/bloom_downsample_pass.frag.glsl diff --git a/base/Shaders/common/bloom_upsample_pass.frag.glsl b/base/Shaders/bloom_upsample_pass.frag.glsl similarity index 100% rename from base/Shaders/common/bloom_upsample_pass.frag.glsl rename to base/Shaders/bloom_upsample_pass.frag.glsl diff --git a/base/Shaders/common/deferred_light.frag.glsl b/base/Shaders/common/deferred_light.frag.glsl deleted file mode 100644 index e114d93b..00000000 --- a/base/Shaders/common/deferred_light.frag.glsl +++ /dev/null @@ -1,3 +0,0 @@ -#version 450 - -#include "../std/deferred_light.glsl" diff --git a/base/Shaders/common/deferred_light_voxel.frag.glsl b/base/Shaders/common/deferred_light_voxel.frag.glsl deleted file mode 100644 index a9b0abaa..00000000 --- a/base/Shaders/common/deferred_light_voxel.frag.glsl +++ /dev/null @@ -1,4 +0,0 @@ -#version 450 -#define _Voxel - -#include "../std/deferred_light.glsl" diff --git a/base/Shaders/common/compositor_pass.frag.glsl b/base/Shaders/compositor_pass.frag.glsl similarity index 100% rename from base/Shaders/common/compositor_pass.frag.glsl rename to base/Shaders/compositor_pass.frag.glsl diff --git a/base/Shaders/common/copy_mrt3_pass.frag.glsl b/base/Shaders/copy_mrt3_pass.frag.glsl similarity index 100% rename from base/Shaders/common/copy_mrt3_pass.frag.glsl rename to base/Shaders/copy_mrt3_pass.frag.glsl diff --git a/base/Shaders/common/cursor.frag.glsl b/base/Shaders/cursor.frag.glsl similarity index 100% rename from base/Shaders/common/cursor.frag.glsl rename to base/Shaders/cursor.frag.glsl diff --git a/base/Shaders/common/cursor.vert.glsl b/base/Shaders/cursor.vert.glsl similarity index 100% rename from base/Shaders/common/cursor.vert.glsl rename to base/Shaders/cursor.vert.glsl diff --git a/base/Shaders/deferred_light.frag.glsl b/base/Shaders/deferred_light.frag.glsl new file mode 100644 index 00000000..f78c47d9 --- /dev/null +++ b/base/Shaders/deferred_light.frag.glsl @@ -0,0 +1,3 @@ +#version 450 + +#include "std/deferred_light.glsl" diff --git a/base/Shaders/deferred_light_voxel.frag.glsl b/base/Shaders/deferred_light_voxel.frag.glsl new file mode 100644 index 00000000..ec1311c6 --- /dev/null +++ b/base/Shaders/deferred_light_voxel.frag.glsl @@ -0,0 +1,4 @@ +#version 450 +#define _Voxel + +#include "std/deferred_light.glsl" diff --git a/base/Shaders/common/histogram_pass.frag.glsl b/base/Shaders/histogram_pass.frag.glsl similarity index 100% rename from base/Shaders/common/histogram_pass.frag.glsl rename to base/Shaders/histogram_pass.frag.glsl diff --git a/base/Shaders/shared/layer_copy.frag.glsl b/base/Shaders/layer_copy.frag.glsl similarity index 100% rename from base/Shaders/shared/layer_copy.frag.glsl rename to base/Shaders/layer_copy.frag.glsl diff --git a/base/Shaders/shared/layer_copy_bgra.frag.glsl b/base/Shaders/layer_copy_bgra.frag.glsl similarity index 100% rename from base/Shaders/shared/layer_copy_bgra.frag.glsl rename to base/Shaders/layer_copy_bgra.frag.glsl diff --git a/base/Shaders/shared/layer_view.vert.glsl b/base/Shaders/layer_view.vert.glsl similarity index 100% rename from base/Shaders/shared/layer_view.vert.glsl rename to base/Shaders/layer_view.vert.glsl diff --git a/base/Shaders/common/line.frag.glsl b/base/Shaders/line.frag.glsl similarity index 100% rename from base/Shaders/common/line.frag.glsl rename to base/Shaders/line.frag.glsl diff --git a/base/Shaders/common/line.vert.glsl b/base/Shaders/line.vert.glsl similarity index 100% rename from base/Shaders/common/line.vert.glsl rename to base/Shaders/line.vert.glsl diff --git a/base/Shaders/shared/mask_apply.frag.glsl b/base/Shaders/mask_apply.frag.glsl similarity index 100% rename from base/Shaders/shared/mask_apply.frag.glsl rename to base/Shaders/mask_apply.frag.glsl diff --git a/base/Shaders/common/mesh_poscol.frag.glsl b/base/Shaders/mesh_poscol.frag.glsl similarity index 100% rename from base/Shaders/common/mesh_poscol.frag.glsl rename to base/Shaders/mesh_poscol.frag.glsl diff --git a/base/Shaders/common/mesh_poscol.vert.glsl b/base/Shaders/mesh_poscol.vert.glsl similarity index 100% rename from base/Shaders/common/mesh_poscol.vert.glsl rename to base/Shaders/mesh_poscol.vert.glsl diff --git a/base/Shaders/shared/mesh_posnortex.frag.glsl b/base/Shaders/mesh_posnortex.frag.glsl similarity index 95% rename from base/Shaders/shared/mesh_posnortex.frag.glsl rename to base/Shaders/mesh_posnortex.frag.glsl index a98a16a4..a3d73de4 100644 --- a/base/Shaders/shared/mesh_posnortex.frag.glsl +++ b/base/Shaders/mesh_posnortex.frag.glsl @@ -1,6 +1,6 @@ #version 450 -#include "../std/gbuffer.glsl" +#include "std/gbuffer.glsl" in vec2 texCoord; in vec3 wnormal; diff --git a/base/Shaders/shared/mesh_posnortex.vert.glsl b/base/Shaders/mesh_posnortex.vert.glsl similarity index 100% rename from base/Shaders/shared/mesh_posnortex.vert.glsl rename to base/Shaders/mesh_posnortex.vert.glsl diff --git a/base/Shaders/common/pass.vert.glsl b/base/Shaders/pass.vert.glsl similarity index 100% rename from base/Shaders/common/pass.vert.glsl rename to base/Shaders/pass.vert.glsl diff --git a/base/Shaders/common/pass_copy.frag.glsl b/base/Shaders/pass_copy.frag.glsl similarity index 100% rename from base/Shaders/common/pass_copy.frag.glsl rename to base/Shaders/pass_copy.frag.glsl diff --git a/base/Shaders/common/pass_viewray.vert.glsl b/base/Shaders/pass_viewray.vert.glsl similarity index 100% rename from base/Shaders/common/pass_viewray.vert.glsl rename to base/Shaders/pass_viewray.vert.glsl diff --git a/base/Shaders/common/pass_viewray2.vert.glsl b/base/Shaders/pass_viewray2.vert.glsl similarity index 100% rename from base/Shaders/common/pass_viewray2.vert.glsl rename to base/Shaders/pass_viewray2.vert.glsl diff --git a/base/Shaders/common/prefilter_envmap.frag.glsl b/base/Shaders/prefilter_envmap.frag.glsl similarity index 100% rename from base/Shaders/common/prefilter_envmap.frag.glsl rename to base/Shaders/prefilter_envmap.frag.glsl diff --git a/base/Shaders/common/smaa_blend_weight.frag.glsl b/base/Shaders/smaa_blend_weight.frag.glsl similarity index 100% rename from base/Shaders/common/smaa_blend_weight.frag.glsl rename to base/Shaders/smaa_blend_weight.frag.glsl diff --git a/base/Shaders/common/smaa_blend_weight.vert.glsl b/base/Shaders/smaa_blend_weight.vert.glsl similarity index 100% rename from base/Shaders/common/smaa_blend_weight.vert.glsl rename to base/Shaders/smaa_blend_weight.vert.glsl diff --git a/base/Shaders/common/smaa_edge_detect.frag.glsl b/base/Shaders/smaa_edge_detect.frag.glsl similarity index 100% rename from base/Shaders/common/smaa_edge_detect.frag.glsl rename to base/Shaders/smaa_edge_detect.frag.glsl diff --git a/base/Shaders/common/smaa_edge_detect.vert.glsl b/base/Shaders/smaa_edge_detect.vert.glsl similarity index 100% rename from base/Shaders/common/smaa_edge_detect.vert.glsl rename to base/Shaders/smaa_edge_detect.vert.glsl diff --git a/base/Shaders/common/smaa_neighborhood_blend.frag.glsl b/base/Shaders/smaa_neighborhood_blend.frag.glsl similarity index 100% rename from base/Shaders/common/smaa_neighborhood_blend.frag.glsl rename to base/Shaders/smaa_neighborhood_blend.frag.glsl diff --git a/base/Shaders/common/smaa_neighborhood_blend.vert.glsl b/base/Shaders/smaa_neighborhood_blend.vert.glsl similarity index 100% rename from base/Shaders/common/smaa_neighborhood_blend.vert.glsl rename to base/Shaders/smaa_neighborhood_blend.vert.glsl diff --git a/base/Shaders/common/ssao_blur_pass.frag.glsl b/base/Shaders/ssao_blur_pass.frag.glsl similarity index 97% rename from base/Shaders/common/ssao_blur_pass.frag.glsl rename to base/Shaders/ssao_blur_pass.frag.glsl index fcca6c20..771fdb43 100644 --- a/base/Shaders/common/ssao_blur_pass.frag.glsl +++ b/base/Shaders/ssao_blur_pass.frag.glsl @@ -1,6 +1,6 @@ #version 450 -#include "../std/gbuffer.glsl" +#include "std/gbuffer.glsl" uniform sampler2D tex; uniform sampler2D gbuffer0; diff --git a/base/Shaders/common/ssao_pass.frag.glsl b/base/Shaders/ssao_pass.frag.glsl similarity index 97% rename from base/Shaders/common/ssao_pass.frag.glsl rename to base/Shaders/ssao_pass.frag.glsl index 59f5d5c8..741787b4 100644 --- a/base/Shaders/common/ssao_pass.frag.glsl +++ b/base/Shaders/ssao_pass.frag.glsl @@ -1,7 +1,7 @@ #version 450 -#include "../std/math.glsl" -#include "../std/gbuffer.glsl" +#include "std/math.glsl" +#include "std/gbuffer.glsl" uniform sampler2D gbufferD; uniform sampler2D gbuffer0; // Normal diff --git a/base/Shaders/common/ssr_blur_pass.frag.glsl b/base/Shaders/ssr_blur_pass.frag.glsl similarity index 95% rename from base/Shaders/common/ssr_blur_pass.frag.glsl rename to base/Shaders/ssr_blur_pass.frag.glsl index 126de307..562e1c16 100644 --- a/base/Shaders/common/ssr_blur_pass.frag.glsl +++ b/base/Shaders/ssr_blur_pass.frag.glsl @@ -1,6 +1,6 @@ #version 450 -#include "../std/gbuffer.glsl" +#include "std/gbuffer.glsl" uniform sampler2D tex; uniform sampler2D gbuffer0; // Roughness diff --git a/base/Shaders/common/ssr_pass.frag.glsl b/base/Shaders/ssr_pass.frag.glsl similarity index 97% rename from base/Shaders/common/ssr_pass.frag.glsl rename to base/Shaders/ssr_pass.frag.glsl index b00a3a88..435bd1c9 100644 --- a/base/Shaders/common/ssr_pass.frag.glsl +++ b/base/Shaders/ssr_pass.frag.glsl @@ -1,7 +1,7 @@ #version 450 -#include "../std/math.glsl" -#include "../std/gbuffer.glsl" +#include "std/math.glsl" +#include "std/gbuffer.glsl" uniform sampler2D tex; uniform sampler2D gbufferD; diff --git a/base/Shaders/std/deferred_light.glsl b/base/Shaders/std/deferred_light.glsl index ba061a50..25b1b71a 100644 --- a/base/Shaders/std/deferred_light.glsl +++ b/base/Shaders/std/deferred_light.glsl @@ -2,11 +2,11 @@ #ifndef _DEFERRED_LIGHT_GLSL_ #define _DEFERRED_LIGHT_GLSL_ -#include "../std/gbuffer.glsl" -#include "../std/light.glsl" -#include "../std/shirr.glsl" +#include "std/gbuffer.glsl" +#include "std/light.glsl" +#include "std/shirr.glsl" #ifdef _Voxel -#include "../std/conetrace.glsl" +#include "std/conetrace.glsl" #endif uniform sampler2D gbufferD; diff --git a/base/Shaders/std/light.glsl b/base/Shaders/std/light.glsl index c0ae77cd..13211f93 100644 --- a/base/Shaders/std/light.glsl +++ b/base/Shaders/std/light.glsl @@ -2,11 +2,11 @@ #ifndef _LIGHT_GLSL_ #define _LIGHT_GLSL_ -#include "../std/brdf.glsl" -#include "../std/math.glsl" -#include "../std/ltc.glsl" +#include "std/brdf.glsl" +#include "std/math.glsl" +#include "std/ltc.glsl" #ifdef _Voxel -#include "../std/conetrace.glsl" +#include "std/conetrace.glsl" #endif uniform vec3 lightArea0; diff --git a/base/Shaders/common/supersample_resolve.frag.glsl b/base/Shaders/supersample_resolve.frag.glsl similarity index 100% rename from base/Shaders/common/supersample_resolve.frag.glsl rename to base/Shaders/supersample_resolve.frag.glsl diff --git a/base/Shaders/common/taa_pass.frag.glsl b/base/Shaders/taa_pass.frag.glsl similarity index 100% rename from base/Shaders/common/taa_pass.frag.glsl rename to base/Shaders/taa_pass.frag.glsl diff --git a/base/Shaders/voxel_glsl/voxel_pos.frag.glsl b/base/Shaders/voxel_glsl/voxel_pos.frag.glsl index 1c9b48a5..9bdc53a0 100644 --- a/base/Shaders/voxel_glsl/voxel_pos.frag.glsl +++ b/base/Shaders/voxel_glsl/voxel_pos.frag.glsl @@ -1,7 +1,7 @@ #version 450 #extension GL_ARB_shader_image_load_store : enable -#include "../std/conetrace.glsl" +#include "std/conetrace.glsl" uniform layout(r8) writeonly image3D voxels; diff --git a/base/Shaders/voxel_glsl/voxel_pos.vert.glsl b/base/Shaders/voxel_glsl/voxel_pos.vert.glsl index 19f6a5f5..a8f91223 100644 --- a/base/Shaders/voxel_glsl/voxel_pos.vert.glsl +++ b/base/Shaders/voxel_glsl/voxel_pos.vert.glsl @@ -1,6 +1,6 @@ #version 450 -#include "../std/conetrace.glsl" +#include "std/conetrace.glsl" uniform mat4 W; diff --git a/base/Shaders/common/world_pass.frag.glsl b/base/Shaders/world_pass.frag.glsl similarity index 93% rename from base/Shaders/common/world_pass.frag.glsl rename to base/Shaders/world_pass.frag.glsl index d23dfca5..f606ee7f 100644 --- a/base/Shaders/common/world_pass.frag.glsl +++ b/base/Shaders/world_pass.frag.glsl @@ -1,6 +1,6 @@ #version 450 -#include "../std/math.glsl" +#include "std/math.glsl" uniform sampler2D envmap; uniform vec4 envmapDataWorld; // angle, sin(angle), cos(angle), strength diff --git a/base/Shaders/common/world_pass.vert.glsl b/base/Shaders/world_pass.vert.glsl similarity index 100% rename from base/Shaders/common/world_pass.vert.glsl rename to base/Shaders/world_pass.vert.glsl