Folder structure cleanup

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/*.glsl", { embed: snapshot });
-project.addShaders("../base/Shaders/shared/*.glsl", { embed: snapshot });
+project.addAssets("../base/Assets/*", { destination: "data/{name}", embed: snapshot });
-project.addAssets("../base/Assets/common/*", { 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}" });

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/*.glsl", { embed: snapshot });
-project.addShaders("../base/Shaders/shared/*.glsl", { embed: snapshot });
+project.addAssets("../base/Assets/*", { destination: "data/{name}", embed: snapshot });
-project.addAssets("../base/Assets/common/*", { 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}" });

base/Shaders/common/deferred_light.frag.glsl

@@ -1,3 +0,0 @@
-#version 450
-
-#include "../std/deferred_light.glsl"

base/Shaders/common/deferred_light_voxel.frag.glsl

@@ -1,4 +0,0 @@
-#version 450
-#define _Voxel
-
-#include "../std/deferred_light.glsl"

base/Shaders/deferred_light.frag.glsl

@@ -0,0 +1,3 @@
+#version 450
+
+#include "std/deferred_light.glsl"

base/Shaders/deferred_light_voxel.frag.glsl

@@ -0,0 +1,4 @@
+#version 450
+#define _Voxel
+
+#include "std/deferred_light.glsl"

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;

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;

base/Shaders/ssao_pass.frag.glsl

@@ -1,7 +1,7 @@
 #version 450
 
-#include "../std/math.glsl"
+#include "std/math.glsl"
-#include "../std/gbuffer.glsl"
+#include "std/gbuffer.glsl"
 
 uniform sampler2D gbufferD;
 uniform sampler2D gbuffer0; // Normal

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

base/Shaders/ssr_pass.frag.glsl

@@ -1,7 +1,7 @@
 #version 450
 
-#include "../std/math.glsl"
+#include "std/math.glsl"
-#include "../std/gbuffer.glsl"
+#include "std/gbuffer.glsl"
 
 uniform sampler2D tex;
 uniform sampler2D gbufferD;

base/Shaders/std/deferred_light.glsl

@@ -2,11 +2,11 @@
 #ifndef _DEFERRED_LIGHT_GLSL_
 #define _DEFERRED_LIGHT_GLSL_
 
-#include "../std/gbuffer.glsl"
+#include "std/gbuffer.glsl"
-#include "../std/light.glsl"
+#include "std/light.glsl"
-#include "../std/shirr.glsl"
+#include "std/shirr.glsl"
 #ifdef _Voxel
-#include "../std/conetrace.glsl"
+#include "std/conetrace.glsl"
 #endif
 
 uniform sampler2D gbufferD;

base/Shaders/std/light.glsl

@@ -2,11 +2,11 @@
 #ifndef _LIGHT_GLSL_
 #define _LIGHT_GLSL_
 
-#include "../std/brdf.glsl"
+#include "std/brdf.glsl"
-#include "../std/math.glsl"
+#include "std/math.glsl"
-#include "../std/ltc.glsl"
+#include "std/ltc.glsl"
 #ifdef _Voxel
-#include "../std/conetrace.glsl"
+#include "std/conetrace.glsl"
 #endif
 
 uniform vec3 lightArea0;

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;
 

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;
 

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