diff --git a/src/deprecated/deprecated.js b/src/deprecated/deprecated.js index 2cecc7ac067..315f28b769f 100644 --- a/src/deprecated/deprecated.js +++ b/src/deprecated/deprecated.js @@ -11,7 +11,7 @@ import { TEXTURETYPE_DEFAULT, TEXTURETYPE_RGBM, TEXTURETYPE_SWIZZLEGGGR } from '../platform/graphics/constants.js'; import { drawQuadWithShader } from '../scene/graphics/quad-render-utils.js'; -import { shaderChunks } from '../scene/shader-lib/chunks/chunks.js'; +import { shaderChunks } from '../scene/shader-lib/chunks-glsl/chunks.js'; import { GraphicsDevice } from '../platform/graphics/graphics-device.js'; import { LayerComposition } from '../scene/composition/layer-composition.js'; import { RenderTarget } from '../platform/graphics/render-target.js'; diff --git a/src/extras/exporters/core-exporter.js b/src/extras/exporters/core-exporter.js index 1a7c4b79cfa..168d1b04f2d 100644 --- a/src/extras/exporters/core-exporter.js +++ b/src/extras/exporters/core-exporter.js @@ -7,7 +7,7 @@ import { FILTER_LINEAR, ADDRESS_CLAMP_TO_EDGE, isCompressedPixelFormat, PIXELFORMAT_RGBA8, SEMANTIC_POSITION } from '../../platform/graphics/constants.js'; -import { shaderChunks } from '../../scene/shader-lib/chunks/chunks.js'; +import { shaderChunks } from '../../scene/shader-lib/chunks-glsl/chunks.js'; import { shaderChunksWGSL } from '../../scene/shader-lib/chunks-wgsl/chunks-wgsl.js'; /** diff --git a/src/extras/render-passes/render-pass-compose.js b/src/extras/render-passes/render-pass-compose.js index 1aea57fa27b..65330ead5ae 100644 --- a/src/extras/render-passes/render-pass-compose.js +++ b/src/extras/render-passes/render-pass-compose.js @@ -1,7 +1,7 @@ import { math } from '../../core/math/math.js'; import { Color } from '../../core/math/color.js'; import { RenderPassShaderQuad } from '../../scene/graphics/render-pass-shader-quad.js'; -import { shaderChunks } from '../../scene/shader-lib/chunks/chunks.js'; +import { shaderChunks } from '../../scene/shader-lib/chunks-glsl/chunks.js'; import { GAMMA_NONE, GAMMA_SRGB, gammaNames, TONEMAP_LINEAR, tonemapNames } from '../../scene/constants.js'; // Contrast Adaptive Sharpening (CAS) is used to apply the sharpening. It's based on AMD's diff --git a/src/extras/render-passes/render-pass-taa.js b/src/extras/render-passes/render-pass-taa.js index fbac090c5ac..77e77445f64 100644 --- a/src/extras/render-passes/render-pass-taa.js +++ b/src/extras/render-passes/render-pass-taa.js @@ -3,7 +3,7 @@ import { ADDRESS_CLAMP_TO_EDGE } from '../../platform/graphics/constants.js'; import { Texture } from '../../platform/graphics/texture.js'; -import { shaderChunks } from '../../scene/shader-lib/chunks/chunks.js'; +import { shaderChunks } from '../../scene/shader-lib/chunks-glsl/chunks.js'; import { RenderPassShaderQuad } from '../../scene/graphics/render-pass-shader-quad.js'; import { RenderTarget } from '../../platform/graphics/render-target.js'; import { PROJECTION_ORTHOGRAPHIC } from '../../scene/constants.js'; diff --git a/src/extras/renderers/outline-renderer.js b/src/extras/renderers/outline-renderer.js index e064d3a5ebc..7581d0c14a7 100644 --- a/src/extras/renderers/outline-renderer.js +++ b/src/extras/renderers/outline-renderer.js @@ -15,7 +15,7 @@ import { QuadRender } from '../../scene/graphics/quad-render.js'; import { StandardMaterialOptions } from '../../scene/materials/standard-material-options.js'; import { StandardMaterial } from '../../scene/materials/standard-material.js'; import { shaderChunksWGSL } from '../../scene/shader-lib/chunks-wgsl/chunks-wgsl.js'; -import { shaderChunks } from '../../scene/shader-lib/chunks/chunks.js'; +import { shaderChunks } from '../../scene/shader-lib/chunks-glsl/chunks.js'; import { ShaderUtils } from '../../scene/shader-lib/shader-utils.js'; /** diff --git a/src/framework/lightmapper/lightmap-filters.js b/src/framework/lightmapper/lightmap-filters.js index dea2f2317f2..e620f2b73d2 100644 --- a/src/framework/lightmapper/lightmap-filters.js +++ b/src/framework/lightmapper/lightmap-filters.js @@ -1,5 +1,5 @@ import { ShaderUtils } from '../../scene/shader-lib/shader-utils.js'; -import { shaderChunks } from '../../scene/shader-lib/chunks/chunks.js'; +import { shaderChunks } from '../../scene/shader-lib/chunks-glsl/chunks.js'; import { shaderChunksWGSL } from '../../scene/shader-lib/chunks-wgsl/chunks-wgsl.js'; import { SEMANTIC_POSITION } from '../../platform/graphics/constants.js'; diff --git a/src/index.js b/src/index.js index 8ada0499845..b5f56df79ca 100644 --- a/src/index.js +++ b/src/index.js @@ -226,7 +226,7 @@ export { RenderPassForward } from './scene/renderer/render-pass-forward.js'; export { ShaderUtils, createShader, createShaderFromCode } from './scene/shader-lib/shader-utils.js'; export { LitShaderOptions } from './scene/shader-lib/programs/lit-shader-options.js'; export { ProgramLibrary } from './scene/shader-lib/program-library.js'; -export { shaderChunks } from './scene/shader-lib/chunks/chunks.js'; +export { shaderChunks } from './scene/shader-lib/chunks-glsl/chunks.js'; export { ChunkUtils } from './scene/shader-lib/chunk-utils.js'; // SCENE / SKY diff --git a/src/scene/graphics/reproject-texture.js b/src/scene/graphics/reproject-texture.js index 3b3e94b6f84..d356c5c4e5f 100644 --- a/src/scene/graphics/reproject-texture.js +++ b/src/scene/graphics/reproject-texture.js @@ -11,7 +11,7 @@ import { DeviceCache } from '../../platform/graphics/device-cache.js'; import { RenderTarget } from '../../platform/graphics/render-target.js'; import { Texture } from '../../platform/graphics/texture.js'; import { ChunkUtils } from '../shader-lib/chunk-utils.js'; -import { shaderChunks } from '../shader-lib/chunks/chunks.js'; +import { shaderChunks } from '../shader-lib/chunks-glsl/chunks.js'; import { getProgramLibrary } from '../shader-lib/get-program-library.js'; import { ShaderUtils } from '../shader-lib/shader-utils.js'; import { BlendState } from '../../platform/graphics/blend-state.js'; diff --git a/src/scene/gsplat/gsplat-material.js b/src/scene/gsplat/gsplat-material.js index 992efd87843..0dca16964b7 100644 --- a/src/scene/gsplat/gsplat-material.js +++ b/src/scene/gsplat/gsplat-material.js @@ -2,7 +2,7 @@ import { CULLFACE_NONE, SEMANTIC_ATTR13, SEMANTIC_POSITION } from '../../platfor import { BLEND_NONE, BLEND_PREMULTIPLIED, DITHER_NONE } from '../constants.js'; import { ShaderMaterial } from '../materials/shader-material.js'; import { shaderChunksWGSL } from '../shader-lib/chunks-wgsl/chunks-wgsl.js'; -import { shaderChunks } from '../shader-lib/chunks/chunks.js'; +import { shaderChunks } from '../shader-lib/chunks-glsl/chunks.js'; /** * @typedef {object} SplatMaterialOptions - The options. diff --git a/src/scene/immediate/immediate.js b/src/scene/immediate/immediate.js index 2add5de3a91..2a0d1c68987 100644 --- a/src/scene/immediate/immediate.js +++ b/src/scene/immediate/immediate.js @@ -5,7 +5,7 @@ import { GraphNode } from '../graph-node.js'; import { Mesh } from '../mesh.js'; import { MeshInstance } from '../mesh-instance.js'; import { ShaderMaterial } from '../materials/shader-material.js'; -import { shaderChunks } from '../shader-lib/chunks/chunks.js'; +import { shaderChunks } from '../shader-lib/chunks-glsl/chunks.js'; import { shaderChunksWGSL } from '../shader-lib/chunks-wgsl/chunks-wgsl.js'; import { ImmediateBatches } from './immediate-batches.js'; diff --git a/src/scene/lighting/lights-buffer.js b/src/scene/lighting/lights-buffer.js index 17756319e6e..9a39d7df3bb 100644 --- a/src/scene/lighting/lights-buffer.js +++ b/src/scene/lighting/lights-buffer.js @@ -4,7 +4,7 @@ import { FloatPacking } from '../../core/math/float-packing.js'; import { LIGHTSHAPE_PUNCTUAL, LIGHTTYPE_SPOT, LIGHTSHAPE_RECT, LIGHTSHAPE_DISK, LIGHTSHAPE_SPHERE, LIGHT_COLOR_DIVIDER } from '../constants.js'; import { Texture } from '../../platform/graphics/texture.js'; import { LightCamera } from '../renderer/light-camera.js'; -import { shaderChunks } from '../shader-lib/chunks/chunks.js'; +import { shaderChunks } from '../shader-lib/chunks-glsl/chunks.js'; import { shaderChunksWGSL } from '../shader-lib/chunks-wgsl/chunks-wgsl.js'; const tempVec3 = new Vec3(); diff --git a/src/scene/morph-instance.js b/src/scene/morph-instance.js index 0b13a6aa684..8a67562c94d 100644 --- a/src/scene/morph-instance.js +++ b/src/scene/morph-instance.js @@ -5,7 +5,7 @@ import { RenderTarget } from '../platform/graphics/render-target.js'; import { DebugGraphics } from '../platform/graphics/debug-graphics.js'; import { ShaderUtils } from './shader-lib/shader-utils.js'; import { BlendState } from '../platform/graphics/blend-state.js'; -import { shaderChunks } from './shader-lib/chunks/chunks.js'; +import { shaderChunks } from './shader-lib/chunks-glsl/chunks.js'; import { shaderChunksWGSL } from './shader-lib/chunks-wgsl/chunks-wgsl.js'; /** diff --git a/src/scene/particle-system/particle-emitter.js b/src/scene/particle-system/particle-emitter.js index 90a5396358b..1f566a37ac1 100644 --- a/src/scene/particle-system/particle-emitter.js +++ b/src/scene/particle-system/particle-emitter.js @@ -40,7 +40,7 @@ import { import { Mesh } from '../mesh.js'; import { MeshInstance } from '../mesh-instance.js'; import { ShaderUtils } from '../shader-lib/shader-utils.js'; -import { shaderChunks } from '../shader-lib/chunks/chunks.js'; +import { shaderChunks } from '../shader-lib/chunks-glsl/chunks.js'; import { shaderChunksWGSL } from '../shader-lib/chunks-wgsl/chunks-wgsl.js'; import { ParticleCPUUpdater } from './cpu-updater.js'; import { ParticleGPUUpdater } from './gpu-updater.js'; diff --git a/src/scene/renderer/render-pass-cookie-renderer.js b/src/scene/renderer/render-pass-cookie-renderer.js index 5bdc7244f53..26c9a20f84b 100644 --- a/src/scene/renderer/render-pass-cookie-renderer.js +++ b/src/scene/renderer/render-pass-cookie-renderer.js @@ -10,7 +10,7 @@ import { BlendState } from '../../platform/graphics/blend-state.js'; import { QuadRender } from '../graphics/quad-render.js'; import { DepthState } from '../../platform/graphics/depth-state.js'; import { RenderPass } from '../../platform/graphics/render-pass.js'; -import { shaderChunks } from '../shader-lib/chunks/chunks.js'; +import { shaderChunks } from '../shader-lib/chunks-glsl/chunks.js'; import { shaderChunksWGSL } from '../shader-lib/chunks-wgsl/chunks-wgsl.js'; const _viewport = new Vec4(); diff --git a/src/scene/renderer/shadow-renderer.js b/src/scene/renderer/shadow-renderer.js index 3b4f61f5326..af6fae5aebb 100644 --- a/src/scene/renderer/shadow-renderer.js +++ b/src/scene/renderer/shadow-renderer.js @@ -18,7 +18,7 @@ import { shadowTypeInfo } from '../constants.js'; import { ShaderPass } from '../shader-pass.js'; -import { shaderChunks } from '../shader-lib/chunks/chunks.js'; +import { shaderChunks } from '../shader-lib/chunks-glsl/chunks.js'; import { ShaderUtils } from '../shader-lib/shader-utils.js'; import { LightCamera } from './light-camera.js'; import { UniformBufferFormat, UniformFormat } from '../../platform/graphics/uniform-buffer-format.js'; diff --git a/src/scene/shader-lib/chunk-utils.js b/src/scene/shader-lib/chunk-utils.js index 1299875cafb..6d2f09524f4 100644 --- a/src/scene/shader-lib/chunk-utils.js +++ b/src/scene/shader-lib/chunk-utils.js @@ -1,4 +1,4 @@ -import { shaderChunks } from './chunks/chunks.js'; +import { shaderChunks } from './chunks-glsl/chunks.js'; /** * @import { CameraShaderParams } from '../camera-shader-params.js' diff --git a/src/scene/shader-lib/chunks/chunk-validation.js b/src/scene/shader-lib/chunks-glsl/chunk-validation.js similarity index 100% rename from src/scene/shader-lib/chunks/chunk-validation.js rename to src/scene/shader-lib/chunks-glsl/chunk-validation.js diff --git a/src/scene/shader-lib/chunks/chunks.js b/src/scene/shader-lib/chunks-glsl/chunks.js similarity index 100% rename from src/scene/shader-lib/chunks/chunks.js rename to src/scene/shader-lib/chunks-glsl/chunks.js diff --git a/src/scene/shader-lib/chunks/common/frag/bayer.js b/src/scene/shader-lib/chunks-glsl/common/frag/bayer.js similarity index 100% rename from src/scene/shader-lib/chunks/common/frag/bayer.js rename to src/scene/shader-lib/chunks-glsl/common/frag/bayer.js diff --git a/src/scene/shader-lib/chunks/common/frag/decode.js b/src/scene/shader-lib/chunks-glsl/common/frag/decode.js similarity index 100% rename from src/scene/shader-lib/chunks/common/frag/decode.js rename to src/scene/shader-lib/chunks-glsl/common/frag/decode.js diff --git a/src/scene/shader-lib/chunks/common/frag/encode.js b/src/scene/shader-lib/chunks-glsl/common/frag/encode.js similarity index 100% rename from src/scene/shader-lib/chunks/common/frag/encode.js rename to src/scene/shader-lib/chunks-glsl/common/frag/encode.js diff --git a/src/scene/shader-lib/chunks/common/frag/envAtlas.js b/src/scene/shader-lib/chunks-glsl/common/frag/envAtlas.js similarity index 100% rename from src/scene/shader-lib/chunks/common/frag/envAtlas.js rename to src/scene/shader-lib/chunks-glsl/common/frag/envAtlas.js diff --git a/src/scene/shader-lib/chunks/common/frag/envProc.js b/src/scene/shader-lib/chunks-glsl/common/frag/envProc.js similarity index 100% rename from src/scene/shader-lib/chunks/common/frag/envProc.js rename to src/scene/shader-lib/chunks-glsl/common/frag/envProc.js diff --git a/src/scene/shader-lib/chunks/common/frag/float-as-uint.js b/src/scene/shader-lib/chunks-glsl/common/frag/float-as-uint.js similarity index 100% rename from src/scene/shader-lib/chunks/common/frag/float-as-uint.js rename to src/scene/shader-lib/chunks-glsl/common/frag/float-as-uint.js diff --git a/src/scene/shader-lib/chunks/common/frag/fog.js b/src/scene/shader-lib/chunks-glsl/common/frag/fog.js similarity index 100% rename from src/scene/shader-lib/chunks/common/frag/fog.js rename to src/scene/shader-lib/chunks-glsl/common/frag/fog.js diff --git a/src/scene/shader-lib/chunks/common/frag/gamma.js b/src/scene/shader-lib/chunks-glsl/common/frag/gamma.js similarity index 100% rename from src/scene/shader-lib/chunks/common/frag/gamma.js rename to src/scene/shader-lib/chunks-glsl/common/frag/gamma.js diff --git a/src/scene/shader-lib/chunks/common/frag/linearizeDepth.js b/src/scene/shader-lib/chunks-glsl/common/frag/linearizeDepth.js similarity index 100% rename from src/scene/shader-lib/chunks/common/frag/linearizeDepth.js rename to src/scene/shader-lib/chunks-glsl/common/frag/linearizeDepth.js diff --git a/src/scene/shader-lib/chunks/common/frag/msdf.js b/src/scene/shader-lib/chunks-glsl/common/frag/msdf.js similarity index 100% rename from src/scene/shader-lib/chunks/common/frag/msdf.js rename to src/scene/shader-lib/chunks-glsl/common/frag/msdf.js diff --git a/src/scene/shader-lib/chunks/common/frag/outputTex2D.js b/src/scene/shader-lib/chunks-glsl/common/frag/outputTex2D.js similarity index 100% rename from src/scene/shader-lib/chunks/common/frag/outputTex2D.js rename to src/scene/shader-lib/chunks-glsl/common/frag/outputTex2D.js diff --git a/src/scene/shader-lib/chunks/common/frag/pick.js b/src/scene/shader-lib/chunks-glsl/common/frag/pick.js similarity index 100% rename from src/scene/shader-lib/chunks/common/frag/pick.js rename to src/scene/shader-lib/chunks-glsl/common/frag/pick.js diff --git a/src/scene/shader-lib/chunks/common/frag/sampleCatmullRom.js b/src/scene/shader-lib/chunks-glsl/common/frag/sampleCatmullRom.js similarity index 100% rename from src/scene/shader-lib/chunks/common/frag/sampleCatmullRom.js rename to src/scene/shader-lib/chunks-glsl/common/frag/sampleCatmullRom.js diff --git a/src/scene/shader-lib/chunks/common/frag/screenDepth.js b/src/scene/shader-lib/chunks-glsl/common/frag/screenDepth.js similarity index 100% rename from src/scene/shader-lib/chunks/common/frag/screenDepth.js rename to src/scene/shader-lib/chunks-glsl/common/frag/screenDepth.js diff --git a/src/scene/shader-lib/chunks/common/frag/spherical.js b/src/scene/shader-lib/chunks-glsl/common/frag/spherical.js similarity index 100% rename from src/scene/shader-lib/chunks/common/frag/spherical.js rename to src/scene/shader-lib/chunks-glsl/common/frag/spherical.js diff --git a/src/scene/shader-lib/chunks/common/frag/tonemapping/tonemapping.js b/src/scene/shader-lib/chunks-glsl/common/frag/tonemapping/tonemapping.js similarity index 100% rename from src/scene/shader-lib/chunks/common/frag/tonemapping/tonemapping.js rename to src/scene/shader-lib/chunks-glsl/common/frag/tonemapping/tonemapping.js diff --git a/src/scene/shader-lib/chunks/common/frag/tonemapping/tonemappingAces.js b/src/scene/shader-lib/chunks-glsl/common/frag/tonemapping/tonemappingAces.js similarity index 100% rename from src/scene/shader-lib/chunks/common/frag/tonemapping/tonemappingAces.js rename to src/scene/shader-lib/chunks-glsl/common/frag/tonemapping/tonemappingAces.js diff --git a/src/scene/shader-lib/chunks/common/frag/tonemapping/tonemappingAces2.js b/src/scene/shader-lib/chunks-glsl/common/frag/tonemapping/tonemappingAces2.js similarity index 100% rename from src/scene/shader-lib/chunks/common/frag/tonemapping/tonemappingAces2.js rename to src/scene/shader-lib/chunks-glsl/common/frag/tonemapping/tonemappingAces2.js diff --git a/src/scene/shader-lib/chunks/common/frag/tonemapping/tonemappingFilmic.js b/src/scene/shader-lib/chunks-glsl/common/frag/tonemapping/tonemappingFilmic.js similarity index 100% rename from src/scene/shader-lib/chunks/common/frag/tonemapping/tonemappingFilmic.js rename to src/scene/shader-lib/chunks-glsl/common/frag/tonemapping/tonemappingFilmic.js diff --git a/src/scene/shader-lib/chunks/common/frag/tonemapping/tonemappingHejl.js b/src/scene/shader-lib/chunks-glsl/common/frag/tonemapping/tonemappingHejl.js similarity index 100% rename from src/scene/shader-lib/chunks/common/frag/tonemapping/tonemappingHejl.js rename to src/scene/shader-lib/chunks-glsl/common/frag/tonemapping/tonemappingHejl.js diff --git a/src/scene/shader-lib/chunks/common/frag/tonemapping/tonemappingLinear.js b/src/scene/shader-lib/chunks-glsl/common/frag/tonemapping/tonemappingLinear.js similarity index 100% rename from src/scene/shader-lib/chunks/common/frag/tonemapping/tonemappingLinear.js rename to src/scene/shader-lib/chunks-glsl/common/frag/tonemapping/tonemappingLinear.js diff --git a/src/scene/shader-lib/chunks/common/frag/tonemapping/tonemappingNeutral.js b/src/scene/shader-lib/chunks-glsl/common/frag/tonemapping/tonemappingNeutral.js similarity index 100% rename from src/scene/shader-lib/chunks/common/frag/tonemapping/tonemappingNeutral.js rename to src/scene/shader-lib/chunks-glsl/common/frag/tonemapping/tonemappingNeutral.js diff --git a/src/scene/shader-lib/chunks/common/frag/tonemapping/tonemappingNone.js b/src/scene/shader-lib/chunks-glsl/common/frag/tonemapping/tonemappingNone.js similarity index 100% rename from src/scene/shader-lib/chunks/common/frag/tonemapping/tonemappingNone.js rename to src/scene/shader-lib/chunks-glsl/common/frag/tonemapping/tonemappingNone.js diff --git a/src/scene/shader-lib/chunks/common/vert/fullscreenQuad.js b/src/scene/shader-lib/chunks-glsl/common/vert/fullscreenQuad.js similarity index 100% rename from src/scene/shader-lib/chunks/common/vert/fullscreenQuad.js rename to src/scene/shader-lib/chunks-glsl/common/vert/fullscreenQuad.js diff --git a/src/scene/shader-lib/chunks/common/vert/msdf.js b/src/scene/shader-lib/chunks-glsl/common/vert/msdf.js similarity index 100% rename from src/scene/shader-lib/chunks/common/vert/msdf.js rename to src/scene/shader-lib/chunks-glsl/common/vert/msdf.js diff --git a/src/scene/shader-lib/chunks/common/vert/normalCore.js b/src/scene/shader-lib/chunks-glsl/common/vert/normalCore.js similarity index 100% rename from src/scene/shader-lib/chunks/common/vert/normalCore.js rename to src/scene/shader-lib/chunks-glsl/common/vert/normalCore.js diff --git a/src/scene/shader-lib/chunks/common/vert/skin.js b/src/scene/shader-lib/chunks-glsl/common/vert/skin.js similarity index 100% rename from src/scene/shader-lib/chunks/common/vert/skin.js rename to src/scene/shader-lib/chunks-glsl/common/vert/skin.js diff --git a/src/scene/shader-lib/chunks/common/vert/skinBatch.js b/src/scene/shader-lib/chunks-glsl/common/vert/skinBatch.js similarity index 100% rename from src/scene/shader-lib/chunks/common/vert/skinBatch.js rename to src/scene/shader-lib/chunks-glsl/common/vert/skinBatch.js diff --git a/src/scene/shader-lib/chunks/common/vert/transform.js b/src/scene/shader-lib/chunks-glsl/common/vert/transform.js similarity index 100% rename from src/scene/shader-lib/chunks/common/vert/transform.js rename to src/scene/shader-lib/chunks-glsl/common/vert/transform.js diff --git a/src/scene/shader-lib/chunks/common/vert/transformCore.js b/src/scene/shader-lib/chunks-glsl/common/vert/transformCore.js similarity index 100% rename from src/scene/shader-lib/chunks/common/vert/transformCore.js rename to src/scene/shader-lib/chunks-glsl/common/vert/transformCore.js diff --git a/src/scene/shader-lib/chunks/common/vert/transformInstancing.js b/src/scene/shader-lib/chunks-glsl/common/vert/transformInstancing.js similarity index 100% rename from src/scene/shader-lib/chunks/common/vert/transformInstancing.js rename to src/scene/shader-lib/chunks-glsl/common/vert/transformInstancing.js diff --git a/src/scene/shader-lib/chunks/gsplat/frag/gsplat.js b/src/scene/shader-lib/chunks-glsl/gsplat/frag/gsplat.js similarity index 100% rename from src/scene/shader-lib/chunks/gsplat/frag/gsplat.js rename to src/scene/shader-lib/chunks-glsl/gsplat/frag/gsplat.js diff --git a/src/scene/shader-lib/chunks/gsplat/vert/gsplat.js b/src/scene/shader-lib/chunks-glsl/gsplat/vert/gsplat.js similarity index 100% rename from src/scene/shader-lib/chunks/gsplat/vert/gsplat.js rename to src/scene/shader-lib/chunks-glsl/gsplat/vert/gsplat.js diff --git a/src/scene/shader-lib/chunks/gsplat/vert/gsplatCenter.js b/src/scene/shader-lib/chunks-glsl/gsplat/vert/gsplatCenter.js similarity index 100% rename from src/scene/shader-lib/chunks/gsplat/vert/gsplatCenter.js rename to src/scene/shader-lib/chunks-glsl/gsplat/vert/gsplatCenter.js diff --git a/src/scene/shader-lib/chunks/gsplat/vert/gsplatColor.js b/src/scene/shader-lib/chunks-glsl/gsplat/vert/gsplatColor.js similarity index 100% rename from src/scene/shader-lib/chunks/gsplat/vert/gsplatColor.js rename to src/scene/shader-lib/chunks-glsl/gsplat/vert/gsplatColor.js diff --git a/src/scene/shader-lib/chunks/gsplat/vert/gsplatCommon.js b/src/scene/shader-lib/chunks-glsl/gsplat/vert/gsplatCommon.js similarity index 100% rename from src/scene/shader-lib/chunks/gsplat/vert/gsplatCommon.js rename to src/scene/shader-lib/chunks-glsl/gsplat/vert/gsplatCommon.js diff --git a/src/scene/shader-lib/chunks/gsplat/vert/gsplatCompressedData.js b/src/scene/shader-lib/chunks-glsl/gsplat/vert/gsplatCompressedData.js similarity index 100% rename from src/scene/shader-lib/chunks/gsplat/vert/gsplatCompressedData.js rename to src/scene/shader-lib/chunks-glsl/gsplat/vert/gsplatCompressedData.js diff --git a/src/scene/shader-lib/chunks/gsplat/vert/gsplatCompressedSH.js b/src/scene/shader-lib/chunks-glsl/gsplat/vert/gsplatCompressedSH.js similarity index 100% rename from src/scene/shader-lib/chunks/gsplat/vert/gsplatCompressedSH.js rename to src/scene/shader-lib/chunks-glsl/gsplat/vert/gsplatCompressedSH.js diff --git a/src/scene/shader-lib/chunks/gsplat/vert/gsplatCorner.js b/src/scene/shader-lib/chunks-glsl/gsplat/vert/gsplatCorner.js similarity index 100% rename from src/scene/shader-lib/chunks/gsplat/vert/gsplatCorner.js rename to src/scene/shader-lib/chunks-glsl/gsplat/vert/gsplatCorner.js diff --git a/src/scene/shader-lib/chunks/gsplat/vert/gsplatData.js b/src/scene/shader-lib/chunks-glsl/gsplat/vert/gsplatData.js similarity index 100% rename from src/scene/shader-lib/chunks/gsplat/vert/gsplatData.js rename to src/scene/shader-lib/chunks-glsl/gsplat/vert/gsplatData.js diff --git a/src/scene/shader-lib/chunks/gsplat/vert/gsplatOutput.js b/src/scene/shader-lib/chunks-glsl/gsplat/vert/gsplatOutput.js similarity index 100% rename from src/scene/shader-lib/chunks/gsplat/vert/gsplatOutput.js rename to src/scene/shader-lib/chunks-glsl/gsplat/vert/gsplatOutput.js diff --git a/src/scene/shader-lib/chunks/gsplat/vert/gsplatSH.js b/src/scene/shader-lib/chunks-glsl/gsplat/vert/gsplatSH.js similarity index 100% rename from src/scene/shader-lib/chunks/gsplat/vert/gsplatSH.js rename to src/scene/shader-lib/chunks-glsl/gsplat/vert/gsplatSH.js diff --git a/src/scene/shader-lib/chunks/gsplat/vert/gsplatSogsColor.js b/src/scene/shader-lib/chunks-glsl/gsplat/vert/gsplatSogsColor.js similarity index 100% rename from src/scene/shader-lib/chunks/gsplat/vert/gsplatSogsColor.js rename to src/scene/shader-lib/chunks-glsl/gsplat/vert/gsplatSogsColor.js diff --git a/src/scene/shader-lib/chunks/gsplat/vert/gsplatSogsData.js b/src/scene/shader-lib/chunks-glsl/gsplat/vert/gsplatSogsData.js similarity index 100% rename from src/scene/shader-lib/chunks/gsplat/vert/gsplatSogsData.js rename to src/scene/shader-lib/chunks-glsl/gsplat/vert/gsplatSogsData.js diff --git a/src/scene/shader-lib/chunks/gsplat/vert/gsplatSogsSH.js b/src/scene/shader-lib/chunks-glsl/gsplat/vert/gsplatSogsSH.js similarity index 100% rename from src/scene/shader-lib/chunks/gsplat/vert/gsplatSogsSH.js rename to src/scene/shader-lib/chunks-glsl/gsplat/vert/gsplatSogsSH.js diff --git a/src/scene/shader-lib/chunks/gsplat/vert/gsplatSource.js b/src/scene/shader-lib/chunks-glsl/gsplat/vert/gsplatSource.js similarity index 100% rename from src/scene/shader-lib/chunks/gsplat/vert/gsplatSource.js rename to src/scene/shader-lib/chunks-glsl/gsplat/vert/gsplatSource.js diff --git a/src/scene/shader-lib/chunks/internal/frag/cookie-blit-2d.js b/src/scene/shader-lib/chunks-glsl/internal/frag/cookie-blit-2d.js similarity index 100% rename from src/scene/shader-lib/chunks/internal/frag/cookie-blit-2d.js rename to src/scene/shader-lib/chunks-glsl/internal/frag/cookie-blit-2d.js diff --git a/src/scene/shader-lib/chunks/internal/frag/cookie-blit-cube.js b/src/scene/shader-lib/chunks-glsl/internal/frag/cookie-blit-cube.js similarity index 100% rename from src/scene/shader-lib/chunks/internal/frag/cookie-blit-cube.js rename to src/scene/shader-lib/chunks-glsl/internal/frag/cookie-blit-cube.js diff --git a/src/scene/shader-lib/chunks/internal/frag/immediateLine.js b/src/scene/shader-lib/chunks-glsl/internal/frag/immediateLine.js similarity index 100% rename from src/scene/shader-lib/chunks/internal/frag/immediateLine.js rename to src/scene/shader-lib/chunks-glsl/internal/frag/immediateLine.js diff --git a/src/scene/shader-lib/chunks/internal/frag/reproject.js b/src/scene/shader-lib/chunks-glsl/internal/frag/reproject.js similarity index 100% rename from src/scene/shader-lib/chunks/internal/frag/reproject.js rename to src/scene/shader-lib/chunks-glsl/internal/frag/reproject.js diff --git a/src/scene/shader-lib/chunks/internal/morph/frag/morph.js b/src/scene/shader-lib/chunks-glsl/internal/morph/frag/morph.js similarity index 100% rename from src/scene/shader-lib/chunks/internal/morph/frag/morph.js rename to src/scene/shader-lib/chunks-glsl/internal/morph/frag/morph.js diff --git a/src/scene/shader-lib/chunks/internal/morph/vert/morph.js b/src/scene/shader-lib/chunks-glsl/internal/morph/vert/morph.js similarity index 100% rename from src/scene/shader-lib/chunks/internal/morph/vert/morph.js rename to src/scene/shader-lib/chunks-glsl/internal/morph/vert/morph.js diff --git a/src/scene/shader-lib/chunks/internal/vert/cookie-blit.js b/src/scene/shader-lib/chunks-glsl/internal/vert/cookie-blit.js similarity index 100% rename from src/scene/shader-lib/chunks/internal/vert/cookie-blit.js rename to src/scene/shader-lib/chunks-glsl/internal/vert/cookie-blit.js diff --git a/src/scene/shader-lib/chunks/internal/vert/immediateLine.js b/src/scene/shader-lib/chunks-glsl/internal/vert/immediateLine.js similarity index 100% rename from src/scene/shader-lib/chunks/internal/vert/immediateLine.js rename to src/scene/shader-lib/chunks-glsl/internal/vert/immediateLine.js diff --git a/src/scene/shader-lib/chunks/internal/vert/reproject.js b/src/scene/shader-lib/chunks-glsl/internal/vert/reproject.js similarity index 100% rename from src/scene/shader-lib/chunks/internal/vert/reproject.js rename to src/scene/shader-lib/chunks-glsl/internal/vert/reproject.js diff --git a/src/scene/shader-lib/chunks/lightmapper/frag/bakeDirLmEnd.js b/src/scene/shader-lib/chunks-glsl/lightmapper/frag/bakeDirLmEnd.js similarity index 100% rename from src/scene/shader-lib/chunks/lightmapper/frag/bakeDirLmEnd.js rename to src/scene/shader-lib/chunks-glsl/lightmapper/frag/bakeDirLmEnd.js diff --git a/src/scene/shader-lib/chunks/lightmapper/frag/bakeLmEnd.js b/src/scene/shader-lib/chunks-glsl/lightmapper/frag/bakeLmEnd.js similarity index 100% rename from src/scene/shader-lib/chunks/lightmapper/frag/bakeLmEnd.js rename to src/scene/shader-lib/chunks-glsl/lightmapper/frag/bakeLmEnd.js diff --git a/src/scene/shader-lib/chunks/lightmapper/frag/bilateralDeNoise.js b/src/scene/shader-lib/chunks-glsl/lightmapper/frag/bilateralDeNoise.js similarity index 100% rename from src/scene/shader-lib/chunks/lightmapper/frag/bilateralDeNoise.js rename to src/scene/shader-lib/chunks-glsl/lightmapper/frag/bilateralDeNoise.js diff --git a/src/scene/shader-lib/chunks/lightmapper/frag/dilate.js b/src/scene/shader-lib/chunks-glsl/lightmapper/frag/dilate.js similarity index 100% rename from src/scene/shader-lib/chunks/lightmapper/frag/dilate.js rename to src/scene/shader-lib/chunks-glsl/lightmapper/frag/dilate.js diff --git a/src/scene/shader-lib/chunks/lit/frag/TBN.js b/src/scene/shader-lib/chunks-glsl/lit/frag/TBN.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/TBN.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/TBN.js diff --git a/src/scene/shader-lib/chunks/lit/frag/ambient.js b/src/scene/shader-lib/chunks-glsl/lit/frag/ambient.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/ambient.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/ambient.js diff --git a/src/scene/shader-lib/chunks/lit/frag/aoDiffuseOcc.js b/src/scene/shader-lib/chunks-glsl/lit/frag/aoDiffuseOcc.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/aoDiffuseOcc.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/aoDiffuseOcc.js diff --git a/src/scene/shader-lib/chunks/lit/frag/aoSpecOcc.js b/src/scene/shader-lib/chunks-glsl/lit/frag/aoSpecOcc.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/aoSpecOcc.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/aoSpecOcc.js diff --git a/src/scene/shader-lib/chunks/lit/frag/base.js b/src/scene/shader-lib/chunks-glsl/lit/frag/base.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/base.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/base.js diff --git a/src/scene/shader-lib/chunks/lit/frag/baseNineSliced.js b/src/scene/shader-lib/chunks-glsl/lit/frag/baseNineSliced.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/baseNineSliced.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/baseNineSliced.js diff --git a/src/scene/shader-lib/chunks/lit/frag/baseNineSlicedTiled.js b/src/scene/shader-lib/chunks-glsl/lit/frag/baseNineSlicedTiled.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/baseNineSlicedTiled.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/baseNineSlicedTiled.js diff --git a/src/scene/shader-lib/chunks/lit/frag/blurVSM.js b/src/scene/shader-lib/chunks-glsl/lit/frag/blurVSM.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/blurVSM.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/blurVSM.js diff --git a/src/scene/shader-lib/chunks/lit/frag/clusteredLight.js b/src/scene/shader-lib/chunks-glsl/lit/frag/clusteredLight.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/clusteredLight.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/clusteredLight.js diff --git a/src/scene/shader-lib/chunks/lit/frag/clusteredLightCookies.js b/src/scene/shader-lib/chunks-glsl/lit/frag/clusteredLightCookies.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/clusteredLightCookies.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/clusteredLightCookies.js diff --git a/src/scene/shader-lib/chunks/lit/frag/clusteredLightShadows.js b/src/scene/shader-lib/chunks-glsl/lit/frag/clusteredLightShadows.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/clusteredLightShadows.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/clusteredLightShadows.js diff --git a/src/scene/shader-lib/chunks/lit/frag/clusteredLightUtils.js b/src/scene/shader-lib/chunks-glsl/lit/frag/clusteredLightUtils.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/clusteredLightUtils.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/clusteredLightUtils.js diff --git a/src/scene/shader-lib/chunks/lit/frag/combine.js b/src/scene/shader-lib/chunks-glsl/lit/frag/combine.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/combine.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/combine.js diff --git a/src/scene/shader-lib/chunks/lit/frag/cookie.js b/src/scene/shader-lib/chunks-glsl/lit/frag/cookie.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/cookie.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/cookie.js diff --git a/src/scene/shader-lib/chunks/lit/frag/cubeMapProject.js b/src/scene/shader-lib/chunks-glsl/lit/frag/cubeMapProject.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/cubeMapProject.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/cubeMapProject.js diff --git a/src/scene/shader-lib/chunks/lit/frag/cubeMapRotate.js b/src/scene/shader-lib/chunks-glsl/lit/frag/cubeMapRotate.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/cubeMapRotate.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/cubeMapRotate.js diff --git a/src/scene/shader-lib/chunks/lit/frag/debug-output.js b/src/scene/shader-lib/chunks-glsl/lit/frag/debug-output.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/debug-output.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/debug-output.js diff --git a/src/scene/shader-lib/chunks/lit/frag/debug-process-frontend.js b/src/scene/shader-lib/chunks-glsl/lit/frag/debug-process-frontend.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/debug-process-frontend.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/debug-process-frontend.js diff --git a/src/scene/shader-lib/chunks/lit/frag/end.js b/src/scene/shader-lib/chunks-glsl/lit/frag/end.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/end.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/end.js diff --git a/src/scene/shader-lib/chunks/lit/frag/falloffInvSquared.js b/src/scene/shader-lib/chunks-glsl/lit/frag/falloffInvSquared.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/falloffInvSquared.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/falloffInvSquared.js diff --git a/src/scene/shader-lib/chunks/lit/frag/falloffLinear.js b/src/scene/shader-lib/chunks-glsl/lit/frag/falloffLinear.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/falloffLinear.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/falloffLinear.js diff --git a/src/scene/shader-lib/chunks/lit/frag/fresnelSchlick.js b/src/scene/shader-lib/chunks-glsl/lit/frag/fresnelSchlick.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/fresnelSchlick.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/fresnelSchlick.js diff --git a/src/scene/shader-lib/chunks/lit/frag/iridescenceDiffraction.js b/src/scene/shader-lib/chunks-glsl/lit/frag/iridescenceDiffraction.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/iridescenceDiffraction.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/iridescenceDiffraction.js diff --git a/src/scene/shader-lib/chunks/lit/frag/lightDiffuseLambert.js b/src/scene/shader-lib/chunks-glsl/lit/frag/lightDiffuseLambert.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/lightDiffuseLambert.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/lightDiffuseLambert.js diff --git a/src/scene/shader-lib/chunks/lit/frag/lightDirPoint.js b/src/scene/shader-lib/chunks-glsl/lit/frag/lightDirPoint.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/lightDirPoint.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/lightDirPoint.js diff --git a/src/scene/shader-lib/chunks/lit/frag/lightSheen.js b/src/scene/shader-lib/chunks-glsl/lit/frag/lightSheen.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/lightSheen.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/lightSheen.js diff --git a/src/scene/shader-lib/chunks/lit/frag/lightSpecularAnisoGGX.js b/src/scene/shader-lib/chunks-glsl/lit/frag/lightSpecularAnisoGGX.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/lightSpecularAnisoGGX.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/lightSpecularAnisoGGX.js diff --git a/src/scene/shader-lib/chunks/lit/frag/lightSpecularBlinn.js b/src/scene/shader-lib/chunks-glsl/lit/frag/lightSpecularBlinn.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/lightSpecularBlinn.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/lightSpecularBlinn.js diff --git a/src/scene/shader-lib/chunks/lit/frag/lighting/lightDeclaration.js b/src/scene/shader-lib/chunks-glsl/lit/frag/lighting/lightDeclaration.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/lighting/lightDeclaration.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/lighting/lightDeclaration.js diff --git a/src/scene/shader-lib/chunks/lit/frag/lighting/lightEvaluation.js b/src/scene/shader-lib/chunks-glsl/lit/frag/lighting/lightEvaluation.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/lighting/lightEvaluation.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/lighting/lightEvaluation.js diff --git a/src/scene/shader-lib/chunks/lit/frag/lighting/lightFunctionLight.js b/src/scene/shader-lib/chunks-glsl/lit/frag/lighting/lightFunctionLight.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/lighting/lightFunctionLight.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/lighting/lightFunctionLight.js diff --git a/src/scene/shader-lib/chunks/lit/frag/lighting/lightFunctionShadow.js b/src/scene/shader-lib/chunks-glsl/lit/frag/lighting/lightFunctionShadow.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/lighting/lightFunctionShadow.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/lighting/lightFunctionShadow.js diff --git a/src/scene/shader-lib/chunks/lit/frag/lighting/lighting.js b/src/scene/shader-lib/chunks-glsl/lit/frag/lighting/lighting.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/lighting/lighting.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/lighting/lighting.js diff --git a/src/scene/shader-lib/chunks/lit/frag/lighting/shadowCascades.js b/src/scene/shader-lib/chunks-glsl/lit/frag/lighting/shadowCascades.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/lighting/shadowCascades.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/lighting/shadowCascades.js diff --git a/src/scene/shader-lib/chunks/lit/frag/lighting/shadowEVSM.js b/src/scene/shader-lib/chunks-glsl/lit/frag/lighting/shadowEVSM.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/lighting/shadowEVSM.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/lighting/shadowEVSM.js diff --git a/src/scene/shader-lib/chunks/lit/frag/lighting/shadowPCF1.js b/src/scene/shader-lib/chunks-glsl/lit/frag/lighting/shadowPCF1.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/lighting/shadowPCF1.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/lighting/shadowPCF1.js diff --git a/src/scene/shader-lib/chunks/lit/frag/lighting/shadowPCF3.js b/src/scene/shader-lib/chunks-glsl/lit/frag/lighting/shadowPCF3.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/lighting/shadowPCF3.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/lighting/shadowPCF3.js diff --git a/src/scene/shader-lib/chunks/lit/frag/lighting/shadowPCF5.js b/src/scene/shader-lib/chunks-glsl/lit/frag/lighting/shadowPCF5.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/lighting/shadowPCF5.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/lighting/shadowPCF5.js diff --git a/src/scene/shader-lib/chunks/lit/frag/lighting/shadowPCSS.js b/src/scene/shader-lib/chunks-glsl/lit/frag/lighting/shadowPCSS.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/lighting/shadowPCSS.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/lighting/shadowPCSS.js diff --git a/src/scene/shader-lib/chunks/lit/frag/lighting/shadowSoft.js b/src/scene/shader-lib/chunks-glsl/lit/frag/lighting/shadowSoft.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/lighting/shadowSoft.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/lighting/shadowSoft.js diff --git a/src/scene/shader-lib/chunks/lit/frag/lightmapAdd.js b/src/scene/shader-lib/chunks-glsl/lit/frag/lightmapAdd.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/lightmapAdd.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/lightmapAdd.js diff --git a/src/scene/shader-lib/chunks/lit/frag/litMain.js b/src/scene/shader-lib/chunks-glsl/lit/frag/litMain.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/litMain.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/litMain.js diff --git a/src/scene/shader-lib/chunks/lit/frag/ltc.js b/src/scene/shader-lib/chunks-glsl/lit/frag/ltc.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/ltc.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/ltc.js diff --git a/src/scene/shader-lib/chunks/lit/frag/metalnessModulate.js b/src/scene/shader-lib/chunks-glsl/lit/frag/metalnessModulate.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/metalnessModulate.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/metalnessModulate.js diff --git a/src/scene/shader-lib/chunks/lit/frag/output.js b/src/scene/shader-lib/chunks-glsl/lit/frag/output.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/output.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/output.js diff --git a/src/scene/shader-lib/chunks/lit/frag/outputAlpha.js b/src/scene/shader-lib/chunks-glsl/lit/frag/outputAlpha.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/outputAlpha.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/outputAlpha.js diff --git a/src/scene/shader-lib/chunks/lit/frag/pass-forward/litForwardBackend.js b/src/scene/shader-lib/chunks-glsl/lit/frag/pass-forward/litForwardBackend.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/pass-forward/litForwardBackend.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/pass-forward/litForwardBackend.js diff --git a/src/scene/shader-lib/chunks/lit/frag/pass-forward/litForwardDeclaration.js b/src/scene/shader-lib/chunks-glsl/lit/frag/pass-forward/litForwardDeclaration.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/pass-forward/litForwardDeclaration.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/pass-forward/litForwardDeclaration.js diff --git a/src/scene/shader-lib/chunks/lit/frag/pass-forward/litForwardMain.js b/src/scene/shader-lib/chunks-glsl/lit/frag/pass-forward/litForwardMain.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/pass-forward/litForwardMain.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/pass-forward/litForwardMain.js diff --git a/src/scene/shader-lib/chunks/lit/frag/pass-forward/litForwardPostCode.js b/src/scene/shader-lib/chunks-glsl/lit/frag/pass-forward/litForwardPostCode.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/pass-forward/litForwardPostCode.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/pass-forward/litForwardPostCode.js diff --git a/src/scene/shader-lib/chunks/lit/frag/pass-forward/litForwardPreCode.js b/src/scene/shader-lib/chunks-glsl/lit/frag/pass-forward/litForwardPreCode.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/pass-forward/litForwardPreCode.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/pass-forward/litForwardPreCode.js diff --git a/src/scene/shader-lib/chunks/lit/frag/pass-other/litOtherMain.js b/src/scene/shader-lib/chunks-glsl/lit/frag/pass-other/litOtherMain.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/pass-other/litOtherMain.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/pass-other/litOtherMain.js diff --git a/src/scene/shader-lib/chunks/lit/frag/pass-shadow/litShadowMain.js b/src/scene/shader-lib/chunks-glsl/lit/frag/pass-shadow/litShadowMain.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/pass-shadow/litShadowMain.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/pass-shadow/litShadowMain.js diff --git a/src/scene/shader-lib/chunks/lit/frag/reflDir.js b/src/scene/shader-lib/chunks-glsl/lit/frag/reflDir.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/reflDir.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/reflDir.js diff --git a/src/scene/shader-lib/chunks/lit/frag/reflDirAniso.js b/src/scene/shader-lib/chunks-glsl/lit/frag/reflDirAniso.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/reflDirAniso.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/reflDirAniso.js diff --git a/src/scene/shader-lib/chunks/lit/frag/reflectionCC.js b/src/scene/shader-lib/chunks-glsl/lit/frag/reflectionCC.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/reflectionCC.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/reflectionCC.js diff --git a/src/scene/shader-lib/chunks/lit/frag/reflectionCube.js b/src/scene/shader-lib/chunks-glsl/lit/frag/reflectionCube.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/reflectionCube.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/reflectionCube.js diff --git a/src/scene/shader-lib/chunks/lit/frag/reflectionEnv.js b/src/scene/shader-lib/chunks-glsl/lit/frag/reflectionEnv.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/reflectionEnv.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/reflectionEnv.js diff --git a/src/scene/shader-lib/chunks/lit/frag/reflectionEnvHQ.js b/src/scene/shader-lib/chunks-glsl/lit/frag/reflectionEnvHQ.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/reflectionEnvHQ.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/reflectionEnvHQ.js diff --git a/src/scene/shader-lib/chunks/lit/frag/reflectionSheen.js b/src/scene/shader-lib/chunks-glsl/lit/frag/reflectionSheen.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/reflectionSheen.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/reflectionSheen.js diff --git a/src/scene/shader-lib/chunks/lit/frag/reflectionSphere.js b/src/scene/shader-lib/chunks-glsl/lit/frag/reflectionSphere.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/reflectionSphere.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/reflectionSphere.js diff --git a/src/scene/shader-lib/chunks/lit/frag/refractionCube.js b/src/scene/shader-lib/chunks-glsl/lit/frag/refractionCube.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/refractionCube.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/refractionCube.js diff --git a/src/scene/shader-lib/chunks/lit/frag/refractionDynamic.js b/src/scene/shader-lib/chunks-glsl/lit/frag/refractionDynamic.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/refractionDynamic.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/refractionDynamic.js diff --git a/src/scene/shader-lib/chunks/lit/frag/spot.js b/src/scene/shader-lib/chunks-glsl/lit/frag/spot.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/spot.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/spot.js diff --git a/src/scene/shader-lib/chunks/lit/frag/startNineSliced.js b/src/scene/shader-lib/chunks-glsl/lit/frag/startNineSliced.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/startNineSliced.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/startNineSliced.js diff --git a/src/scene/shader-lib/chunks/lit/frag/startNineSlicedTiled.js b/src/scene/shader-lib/chunks-glsl/lit/frag/startNineSlicedTiled.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/startNineSlicedTiled.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/startNineSlicedTiled.js diff --git a/src/scene/shader-lib/chunks/lit/frag/twoSidedLighting.js b/src/scene/shader-lib/chunks-glsl/lit/frag/twoSidedLighting.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/twoSidedLighting.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/twoSidedLighting.js diff --git a/src/scene/shader-lib/chunks/lit/frag/viewDir.js b/src/scene/shader-lib/chunks-glsl/lit/frag/viewDir.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/frag/viewDir.js rename to src/scene/shader-lib/chunks-glsl/lit/frag/viewDir.js diff --git a/src/scene/shader-lib/chunks/lit/vert/litMain.js b/src/scene/shader-lib/chunks-glsl/lit/vert/litMain.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/vert/litMain.js rename to src/scene/shader-lib/chunks-glsl/lit/vert/litMain.js diff --git a/src/scene/shader-lib/chunks/lit/vert/normal.js b/src/scene/shader-lib/chunks-glsl/lit/vert/normal.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/vert/normal.js rename to src/scene/shader-lib/chunks-glsl/lit/vert/normal.js diff --git a/src/scene/shader-lib/chunks/lit/vert/uv0.js b/src/scene/shader-lib/chunks-glsl/lit/vert/uv0.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/vert/uv0.js rename to src/scene/shader-lib/chunks-glsl/lit/vert/uv0.js diff --git a/src/scene/shader-lib/chunks/lit/vert/uv1.js b/src/scene/shader-lib/chunks-glsl/lit/vert/uv1.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/vert/uv1.js rename to src/scene/shader-lib/chunks-glsl/lit/vert/uv1.js diff --git a/src/scene/shader-lib/chunks/lit/vert/uvTransform.js b/src/scene/shader-lib/chunks-glsl/lit/vert/uvTransform.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/vert/uvTransform.js rename to src/scene/shader-lib/chunks-glsl/lit/vert/uvTransform.js diff --git a/src/scene/shader-lib/chunks/lit/vert/uvTransformUniforms.js b/src/scene/shader-lib/chunks-glsl/lit/vert/uvTransformUniforms.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/vert/uvTransformUniforms.js rename to src/scene/shader-lib/chunks-glsl/lit/vert/uvTransformUniforms.js diff --git a/src/scene/shader-lib/chunks/lit/vert/viewNormal.js b/src/scene/shader-lib/chunks-glsl/lit/vert/viewNormal.js similarity index 100% rename from src/scene/shader-lib/chunks/lit/vert/viewNormal.js rename to src/scene/shader-lib/chunks-glsl/lit/vert/viewNormal.js diff --git a/src/scene/shader-lib/chunks/particle/frag/particle-shader.js b/src/scene/shader-lib/chunks-glsl/particle/frag/particle-shader.js similarity index 100% rename from src/scene/shader-lib/chunks/particle/frag/particle-shader.js rename to src/scene/shader-lib/chunks-glsl/particle/frag/particle-shader.js diff --git a/src/scene/shader-lib/chunks/particle/frag/particle-simulation.js b/src/scene/shader-lib/chunks-glsl/particle/frag/particle-simulation.js similarity index 100% rename from src/scene/shader-lib/chunks/particle/frag/particle-simulation.js rename to src/scene/shader-lib/chunks-glsl/particle/frag/particle-simulation.js diff --git a/src/scene/shader-lib/chunks/particle/frag/particle.js b/src/scene/shader-lib/chunks-glsl/particle/frag/particle.js similarity index 100% rename from src/scene/shader-lib/chunks/particle/frag/particle.js rename to src/scene/shader-lib/chunks-glsl/particle/frag/particle.js diff --git a/src/scene/shader-lib/chunks/particle/frag/particleInputFloat.js b/src/scene/shader-lib/chunks-glsl/particle/frag/particleInputFloat.js similarity index 100% rename from src/scene/shader-lib/chunks/particle/frag/particleInputFloat.js rename to src/scene/shader-lib/chunks-glsl/particle/frag/particleInputFloat.js diff --git a/src/scene/shader-lib/chunks/particle/frag/particleInputRgba8.js b/src/scene/shader-lib/chunks-glsl/particle/frag/particleInputRgba8.js similarity index 100% rename from src/scene/shader-lib/chunks/particle/frag/particleInputRgba8.js rename to src/scene/shader-lib/chunks-glsl/particle/frag/particleInputRgba8.js diff --git a/src/scene/shader-lib/chunks/particle/frag/particleOutputFloat.js b/src/scene/shader-lib/chunks-glsl/particle/frag/particleOutputFloat.js similarity index 100% rename from src/scene/shader-lib/chunks/particle/frag/particleOutputFloat.js rename to src/scene/shader-lib/chunks-glsl/particle/frag/particleOutputFloat.js diff --git a/src/scene/shader-lib/chunks/particle/frag/particleOutputRgba8.js b/src/scene/shader-lib/chunks-glsl/particle/frag/particleOutputRgba8.js similarity index 100% rename from src/scene/shader-lib/chunks/particle/frag/particleOutputRgba8.js rename to src/scene/shader-lib/chunks-glsl/particle/frag/particleOutputRgba8.js diff --git a/src/scene/shader-lib/chunks/particle/frag/particleUpdaterAABB.js b/src/scene/shader-lib/chunks-glsl/particle/frag/particleUpdaterAABB.js similarity index 100% rename from src/scene/shader-lib/chunks/particle/frag/particleUpdaterAABB.js rename to src/scene/shader-lib/chunks-glsl/particle/frag/particleUpdaterAABB.js diff --git a/src/scene/shader-lib/chunks/particle/frag/particleUpdaterEnd.js b/src/scene/shader-lib/chunks-glsl/particle/frag/particleUpdaterEnd.js similarity index 100% rename from src/scene/shader-lib/chunks/particle/frag/particleUpdaterEnd.js rename to src/scene/shader-lib/chunks-glsl/particle/frag/particleUpdaterEnd.js diff --git a/src/scene/shader-lib/chunks/particle/frag/particleUpdaterInit.js b/src/scene/shader-lib/chunks-glsl/particle/frag/particleUpdaterInit.js similarity index 100% rename from src/scene/shader-lib/chunks/particle/frag/particleUpdaterInit.js rename to src/scene/shader-lib/chunks-glsl/particle/frag/particleUpdaterInit.js diff --git a/src/scene/shader-lib/chunks/particle/frag/particleUpdaterNoRespawn.js b/src/scene/shader-lib/chunks-glsl/particle/frag/particleUpdaterNoRespawn.js similarity index 100% rename from src/scene/shader-lib/chunks/particle/frag/particleUpdaterNoRespawn.js rename to src/scene/shader-lib/chunks-glsl/particle/frag/particleUpdaterNoRespawn.js diff --git a/src/scene/shader-lib/chunks/particle/frag/particleUpdaterOnStop.js b/src/scene/shader-lib/chunks-glsl/particle/frag/particleUpdaterOnStop.js similarity index 100% rename from src/scene/shader-lib/chunks/particle/frag/particleUpdaterOnStop.js rename to src/scene/shader-lib/chunks-glsl/particle/frag/particleUpdaterOnStop.js diff --git a/src/scene/shader-lib/chunks/particle/frag/particleUpdaterRespawn.js b/src/scene/shader-lib/chunks-glsl/particle/frag/particleUpdaterRespawn.js similarity index 100% rename from src/scene/shader-lib/chunks/particle/frag/particleUpdaterRespawn.js rename to src/scene/shader-lib/chunks-glsl/particle/frag/particleUpdaterRespawn.js diff --git a/src/scene/shader-lib/chunks/particle/frag/particleUpdaterSphere.js b/src/scene/shader-lib/chunks-glsl/particle/frag/particleUpdaterSphere.js similarity index 100% rename from src/scene/shader-lib/chunks/particle/frag/particleUpdaterSphere.js rename to src/scene/shader-lib/chunks-glsl/particle/frag/particleUpdaterSphere.js diff --git a/src/scene/shader-lib/chunks/particle/frag/particleUpdaterStart.js b/src/scene/shader-lib/chunks-glsl/particle/frag/particleUpdaterStart.js similarity index 100% rename from src/scene/shader-lib/chunks/particle/frag/particleUpdaterStart.js rename to src/scene/shader-lib/chunks-glsl/particle/frag/particleUpdaterStart.js diff --git a/src/scene/shader-lib/chunks/particle/frag/particle_blendAdd.js b/src/scene/shader-lib/chunks-glsl/particle/frag/particle_blendAdd.js similarity index 100% rename from src/scene/shader-lib/chunks/particle/frag/particle_blendAdd.js rename to src/scene/shader-lib/chunks-glsl/particle/frag/particle_blendAdd.js diff --git a/src/scene/shader-lib/chunks/particle/frag/particle_blendMultiply.js b/src/scene/shader-lib/chunks-glsl/particle/frag/particle_blendMultiply.js similarity index 100% rename from src/scene/shader-lib/chunks/particle/frag/particle_blendMultiply.js rename to src/scene/shader-lib/chunks-glsl/particle/frag/particle_blendMultiply.js diff --git a/src/scene/shader-lib/chunks/particle/frag/particle_blendNormal.js b/src/scene/shader-lib/chunks-glsl/particle/frag/particle_blendNormal.js similarity index 100% rename from src/scene/shader-lib/chunks/particle/frag/particle_blendNormal.js rename to src/scene/shader-lib/chunks-glsl/particle/frag/particle_blendNormal.js diff --git a/src/scene/shader-lib/chunks/particle/frag/particle_end.js b/src/scene/shader-lib/chunks-glsl/particle/frag/particle_end.js similarity index 100% rename from src/scene/shader-lib/chunks/particle/frag/particle_end.js rename to src/scene/shader-lib/chunks-glsl/particle/frag/particle_end.js diff --git a/src/scene/shader-lib/chunks/particle/frag/particle_halflambert.js b/src/scene/shader-lib/chunks-glsl/particle/frag/particle_halflambert.js similarity index 100% rename from src/scene/shader-lib/chunks/particle/frag/particle_halflambert.js rename to src/scene/shader-lib/chunks-glsl/particle/frag/particle_halflambert.js diff --git a/src/scene/shader-lib/chunks/particle/frag/particle_lambert.js b/src/scene/shader-lib/chunks-glsl/particle/frag/particle_lambert.js similarity index 100% rename from src/scene/shader-lib/chunks/particle/frag/particle_lambert.js rename to src/scene/shader-lib/chunks-glsl/particle/frag/particle_lambert.js diff --git a/src/scene/shader-lib/chunks/particle/frag/particle_lighting.js b/src/scene/shader-lib/chunks-glsl/particle/frag/particle_lighting.js similarity index 100% rename from src/scene/shader-lib/chunks/particle/frag/particle_lighting.js rename to src/scene/shader-lib/chunks-glsl/particle/frag/particle_lighting.js diff --git a/src/scene/shader-lib/chunks/particle/frag/particle_normalMap.js b/src/scene/shader-lib/chunks-glsl/particle/frag/particle_normalMap.js similarity index 100% rename from src/scene/shader-lib/chunks/particle/frag/particle_normalMap.js rename to src/scene/shader-lib/chunks-glsl/particle/frag/particle_normalMap.js diff --git a/src/scene/shader-lib/chunks/particle/frag/particle_soft.js b/src/scene/shader-lib/chunks-glsl/particle/frag/particle_soft.js similarity index 100% rename from src/scene/shader-lib/chunks/particle/frag/particle_soft.js rename to src/scene/shader-lib/chunks-glsl/particle/frag/particle_soft.js diff --git a/src/scene/shader-lib/chunks/particle/vert/particle-shader.js b/src/scene/shader-lib/chunks-glsl/particle/vert/particle-shader.js similarity index 100% rename from src/scene/shader-lib/chunks/particle/vert/particle-shader.js rename to src/scene/shader-lib/chunks-glsl/particle/vert/particle-shader.js diff --git a/src/scene/shader-lib/chunks/particle/vert/particle.js b/src/scene/shader-lib/chunks-glsl/particle/vert/particle.js similarity index 100% rename from src/scene/shader-lib/chunks/particle/vert/particle.js rename to src/scene/shader-lib/chunks-glsl/particle/vert/particle.js diff --git a/src/scene/shader-lib/chunks/particle/vert/particleAnimFrameClamp.js b/src/scene/shader-lib/chunks-glsl/particle/vert/particleAnimFrameClamp.js similarity index 100% rename from src/scene/shader-lib/chunks/particle/vert/particleAnimFrameClamp.js rename to src/scene/shader-lib/chunks-glsl/particle/vert/particleAnimFrameClamp.js diff --git a/src/scene/shader-lib/chunks/particle/vert/particleAnimFrameLoop.js b/src/scene/shader-lib/chunks-glsl/particle/vert/particleAnimFrameLoop.js similarity index 100% rename from src/scene/shader-lib/chunks/particle/vert/particleAnimFrameLoop.js rename to src/scene/shader-lib/chunks-glsl/particle/vert/particleAnimFrameLoop.js diff --git a/src/scene/shader-lib/chunks/particle/vert/particleAnimTex.js b/src/scene/shader-lib/chunks-glsl/particle/vert/particleAnimTex.js similarity index 100% rename from src/scene/shader-lib/chunks/particle/vert/particleAnimTex.js rename to src/scene/shader-lib/chunks-glsl/particle/vert/particleAnimTex.js diff --git a/src/scene/shader-lib/chunks/particle/vert/particle_TBN.js b/src/scene/shader-lib/chunks-glsl/particle/vert/particle_TBN.js similarity index 100% rename from src/scene/shader-lib/chunks/particle/vert/particle_TBN.js rename to src/scene/shader-lib/chunks-glsl/particle/vert/particle_TBN.js diff --git a/src/scene/shader-lib/chunks/particle/vert/particle_billboard.js b/src/scene/shader-lib/chunks-glsl/particle/vert/particle_billboard.js similarity index 100% rename from src/scene/shader-lib/chunks/particle/vert/particle_billboard.js rename to src/scene/shader-lib/chunks-glsl/particle/vert/particle_billboard.js diff --git a/src/scene/shader-lib/chunks/particle/vert/particle_cpu.js b/src/scene/shader-lib/chunks-glsl/particle/vert/particle_cpu.js similarity index 100% rename from src/scene/shader-lib/chunks/particle/vert/particle_cpu.js rename to src/scene/shader-lib/chunks-glsl/particle/vert/particle_cpu.js diff --git a/src/scene/shader-lib/chunks/particle/vert/particle_cpu_end.js b/src/scene/shader-lib/chunks-glsl/particle/vert/particle_cpu_end.js similarity index 100% rename from src/scene/shader-lib/chunks/particle/vert/particle_cpu_end.js rename to src/scene/shader-lib/chunks-glsl/particle/vert/particle_cpu_end.js diff --git a/src/scene/shader-lib/chunks/particle/vert/particle_customFace.js b/src/scene/shader-lib/chunks-glsl/particle/vert/particle_customFace.js similarity index 100% rename from src/scene/shader-lib/chunks/particle/vert/particle_customFace.js rename to src/scene/shader-lib/chunks-glsl/particle/vert/particle_customFace.js diff --git a/src/scene/shader-lib/chunks/particle/vert/particle_end.js b/src/scene/shader-lib/chunks-glsl/particle/vert/particle_end.js similarity index 100% rename from src/scene/shader-lib/chunks/particle/vert/particle_end.js rename to src/scene/shader-lib/chunks-glsl/particle/vert/particle_end.js diff --git a/src/scene/shader-lib/chunks/particle/vert/particle_init.js b/src/scene/shader-lib/chunks-glsl/particle/vert/particle_init.js similarity index 100% rename from src/scene/shader-lib/chunks/particle/vert/particle_init.js rename to src/scene/shader-lib/chunks-glsl/particle/vert/particle_init.js diff --git a/src/scene/shader-lib/chunks/particle/vert/particle_localShift.js b/src/scene/shader-lib/chunks-glsl/particle/vert/particle_localShift.js similarity index 100% rename from src/scene/shader-lib/chunks/particle/vert/particle_localShift.js rename to src/scene/shader-lib/chunks-glsl/particle/vert/particle_localShift.js diff --git a/src/scene/shader-lib/chunks/particle/vert/particle_mesh.js b/src/scene/shader-lib/chunks-glsl/particle/vert/particle_mesh.js similarity index 100% rename from src/scene/shader-lib/chunks/particle/vert/particle_mesh.js rename to src/scene/shader-lib/chunks-glsl/particle/vert/particle_mesh.js diff --git a/src/scene/shader-lib/chunks/particle/vert/particle_normal.js b/src/scene/shader-lib/chunks-glsl/particle/vert/particle_normal.js similarity index 100% rename from src/scene/shader-lib/chunks/particle/vert/particle_normal.js rename to src/scene/shader-lib/chunks-glsl/particle/vert/particle_normal.js diff --git a/src/scene/shader-lib/chunks/particle/vert/particle_pointAlong.js b/src/scene/shader-lib/chunks-glsl/particle/vert/particle_pointAlong.js similarity index 100% rename from src/scene/shader-lib/chunks/particle/vert/particle_pointAlong.js rename to src/scene/shader-lib/chunks-glsl/particle/vert/particle_pointAlong.js diff --git a/src/scene/shader-lib/chunks/particle/vert/particle_soft.js b/src/scene/shader-lib/chunks-glsl/particle/vert/particle_soft.js similarity index 100% rename from src/scene/shader-lib/chunks/particle/vert/particle_soft.js rename to src/scene/shader-lib/chunks-glsl/particle/vert/particle_soft.js diff --git a/src/scene/shader-lib/chunks/particle/vert/particle_stretch.js b/src/scene/shader-lib/chunks-glsl/particle/vert/particle_stretch.js similarity index 100% rename from src/scene/shader-lib/chunks/particle/vert/particle_stretch.js rename to src/scene/shader-lib/chunks-glsl/particle/vert/particle_stretch.js diff --git a/src/scene/shader-lib/chunks/particle/vert/particle_wrap.js b/src/scene/shader-lib/chunks-glsl/particle/vert/particle_wrap.js similarity index 100% rename from src/scene/shader-lib/chunks/particle/vert/particle_wrap.js rename to src/scene/shader-lib/chunks-glsl/particle/vert/particle_wrap.js diff --git a/src/scene/shader-lib/chunks/skybox/frag/skybox.js b/src/scene/shader-lib/chunks-glsl/skybox/frag/skybox.js similarity index 100% rename from src/scene/shader-lib/chunks/skybox/frag/skybox.js rename to src/scene/shader-lib/chunks-glsl/skybox/frag/skybox.js diff --git a/src/scene/shader-lib/chunks/skybox/vert/skybox.js b/src/scene/shader-lib/chunks-glsl/skybox/vert/skybox.js similarity index 100% rename from src/scene/shader-lib/chunks/skybox/vert/skybox.js rename to src/scene/shader-lib/chunks-glsl/skybox/vert/skybox.js diff --git a/src/scene/shader-lib/chunks/standard/frag/alphaTest.js b/src/scene/shader-lib/chunks-glsl/standard/frag/alphaTest.js similarity index 100% rename from src/scene/shader-lib/chunks/standard/frag/alphaTest.js rename to src/scene/shader-lib/chunks-glsl/standard/frag/alphaTest.js diff --git a/src/scene/shader-lib/chunks/standard/frag/ao.js b/src/scene/shader-lib/chunks-glsl/standard/frag/ao.js similarity index 100% rename from src/scene/shader-lib/chunks/standard/frag/ao.js rename to src/scene/shader-lib/chunks-glsl/standard/frag/ao.js diff --git a/src/scene/shader-lib/chunks/standard/frag/clearCoat.js b/src/scene/shader-lib/chunks-glsl/standard/frag/clearCoat.js similarity index 100% rename from src/scene/shader-lib/chunks/standard/frag/clearCoat.js rename to src/scene/shader-lib/chunks-glsl/standard/frag/clearCoat.js diff --git a/src/scene/shader-lib/chunks/standard/frag/clearCoatGloss.js b/src/scene/shader-lib/chunks-glsl/standard/frag/clearCoatGloss.js similarity index 100% rename from src/scene/shader-lib/chunks/standard/frag/clearCoatGloss.js rename to src/scene/shader-lib/chunks-glsl/standard/frag/clearCoatGloss.js diff --git a/src/scene/shader-lib/chunks/standard/frag/clearCoatNormal.js b/src/scene/shader-lib/chunks-glsl/standard/frag/clearCoatNormal.js similarity index 100% rename from src/scene/shader-lib/chunks/standard/frag/clearCoatNormal.js rename to src/scene/shader-lib/chunks-glsl/standard/frag/clearCoatNormal.js diff --git a/src/scene/shader-lib/chunks/standard/frag/detailModes.js b/src/scene/shader-lib/chunks-glsl/standard/frag/detailModes.js similarity index 100% rename from src/scene/shader-lib/chunks/standard/frag/detailModes.js rename to src/scene/shader-lib/chunks-glsl/standard/frag/detailModes.js diff --git a/src/scene/shader-lib/chunks/standard/frag/diffuse.js b/src/scene/shader-lib/chunks-glsl/standard/frag/diffuse.js similarity index 100% rename from src/scene/shader-lib/chunks/standard/frag/diffuse.js rename to src/scene/shader-lib/chunks-glsl/standard/frag/diffuse.js diff --git a/src/scene/shader-lib/chunks/standard/frag/emissive.js b/src/scene/shader-lib/chunks-glsl/standard/frag/emissive.js similarity index 100% rename from src/scene/shader-lib/chunks/standard/frag/emissive.js rename to src/scene/shader-lib/chunks-glsl/standard/frag/emissive.js diff --git a/src/scene/shader-lib/chunks/standard/frag/gloss.js b/src/scene/shader-lib/chunks-glsl/standard/frag/gloss.js similarity index 100% rename from src/scene/shader-lib/chunks/standard/frag/gloss.js rename to src/scene/shader-lib/chunks-glsl/standard/frag/gloss.js diff --git a/src/scene/shader-lib/chunks/standard/frag/ior.js b/src/scene/shader-lib/chunks-glsl/standard/frag/ior.js similarity index 100% rename from src/scene/shader-lib/chunks/standard/frag/ior.js rename to src/scene/shader-lib/chunks-glsl/standard/frag/ior.js diff --git a/src/scene/shader-lib/chunks/standard/frag/iridescence.js b/src/scene/shader-lib/chunks-glsl/standard/frag/iridescence.js similarity index 100% rename from src/scene/shader-lib/chunks/standard/frag/iridescence.js rename to src/scene/shader-lib/chunks-glsl/standard/frag/iridescence.js diff --git a/src/scene/shader-lib/chunks/standard/frag/iridescenceThickness.js b/src/scene/shader-lib/chunks-glsl/standard/frag/iridescenceThickness.js similarity index 100% rename from src/scene/shader-lib/chunks/standard/frag/iridescenceThickness.js rename to src/scene/shader-lib/chunks-glsl/standard/frag/iridescenceThickness.js diff --git a/src/scene/shader-lib/chunks/standard/frag/lightmap.js b/src/scene/shader-lib/chunks-glsl/standard/frag/lightmap.js similarity index 100% rename from src/scene/shader-lib/chunks/standard/frag/lightmap.js rename to src/scene/shader-lib/chunks-glsl/standard/frag/lightmap.js diff --git a/src/scene/shader-lib/chunks/standard/frag/litShaderArgs.js b/src/scene/shader-lib/chunks-glsl/standard/frag/litShaderArgs.js similarity index 100% rename from src/scene/shader-lib/chunks/standard/frag/litShaderArgs.js rename to src/scene/shader-lib/chunks-glsl/standard/frag/litShaderArgs.js diff --git a/src/scene/shader-lib/chunks/standard/frag/litShaderCore.js b/src/scene/shader-lib/chunks-glsl/standard/frag/litShaderCore.js similarity index 100% rename from src/scene/shader-lib/chunks/standard/frag/litShaderCore.js rename to src/scene/shader-lib/chunks-glsl/standard/frag/litShaderCore.js diff --git a/src/scene/shader-lib/chunks/standard/frag/metalness.js b/src/scene/shader-lib/chunks-glsl/standard/frag/metalness.js similarity index 100% rename from src/scene/shader-lib/chunks/standard/frag/metalness.js rename to src/scene/shader-lib/chunks-glsl/standard/frag/metalness.js diff --git a/src/scene/shader-lib/chunks/standard/frag/normalMap.js b/src/scene/shader-lib/chunks-glsl/standard/frag/normalMap.js similarity index 100% rename from src/scene/shader-lib/chunks/standard/frag/normalMap.js rename to src/scene/shader-lib/chunks-glsl/standard/frag/normalMap.js diff --git a/src/scene/shader-lib/chunks/standard/frag/opacity-dither.js b/src/scene/shader-lib/chunks-glsl/standard/frag/opacity-dither.js similarity index 100% rename from src/scene/shader-lib/chunks/standard/frag/opacity-dither.js rename to src/scene/shader-lib/chunks-glsl/standard/frag/opacity-dither.js diff --git a/src/scene/shader-lib/chunks/standard/frag/opacity.js b/src/scene/shader-lib/chunks-glsl/standard/frag/opacity.js similarity index 100% rename from src/scene/shader-lib/chunks/standard/frag/opacity.js rename to src/scene/shader-lib/chunks-glsl/standard/frag/opacity.js diff --git a/src/scene/shader-lib/chunks/standard/frag/parallax.js b/src/scene/shader-lib/chunks-glsl/standard/frag/parallax.js similarity index 100% rename from src/scene/shader-lib/chunks/standard/frag/parallax.js rename to src/scene/shader-lib/chunks-glsl/standard/frag/parallax.js diff --git a/src/scene/shader-lib/chunks/standard/frag/sheen.js b/src/scene/shader-lib/chunks-glsl/standard/frag/sheen.js similarity index 100% rename from src/scene/shader-lib/chunks/standard/frag/sheen.js rename to src/scene/shader-lib/chunks-glsl/standard/frag/sheen.js diff --git a/src/scene/shader-lib/chunks/standard/frag/sheenGloss.js b/src/scene/shader-lib/chunks-glsl/standard/frag/sheenGloss.js similarity index 100% rename from src/scene/shader-lib/chunks/standard/frag/sheenGloss.js rename to src/scene/shader-lib/chunks-glsl/standard/frag/sheenGloss.js diff --git a/src/scene/shader-lib/chunks/standard/frag/specular.js b/src/scene/shader-lib/chunks-glsl/standard/frag/specular.js similarity index 100% rename from src/scene/shader-lib/chunks/standard/frag/specular.js rename to src/scene/shader-lib/chunks-glsl/standard/frag/specular.js diff --git a/src/scene/shader-lib/chunks/standard/frag/specularityFactor.js b/src/scene/shader-lib/chunks-glsl/standard/frag/specularityFactor.js similarity index 100% rename from src/scene/shader-lib/chunks/standard/frag/specularityFactor.js rename to src/scene/shader-lib/chunks-glsl/standard/frag/specularityFactor.js diff --git a/src/scene/shader-lib/chunks/standard/frag/stdDeclaration.js b/src/scene/shader-lib/chunks-glsl/standard/frag/stdDeclaration.js similarity index 100% rename from src/scene/shader-lib/chunks/standard/frag/stdDeclaration.js rename to src/scene/shader-lib/chunks-glsl/standard/frag/stdDeclaration.js diff --git a/src/scene/shader-lib/chunks/standard/frag/stdFrontEnd.js b/src/scene/shader-lib/chunks-glsl/standard/frag/stdFrontEnd.js similarity index 100% rename from src/scene/shader-lib/chunks/standard/frag/stdFrontEnd.js rename to src/scene/shader-lib/chunks-glsl/standard/frag/stdFrontEnd.js diff --git a/src/scene/shader-lib/chunks/standard/frag/thickness.js b/src/scene/shader-lib/chunks-glsl/standard/frag/thickness.js similarity index 100% rename from src/scene/shader-lib/chunks/standard/frag/thickness.js rename to src/scene/shader-lib/chunks-glsl/standard/frag/thickness.js diff --git a/src/scene/shader-lib/chunks/standard/frag/transmission.js b/src/scene/shader-lib/chunks-glsl/standard/frag/transmission.js similarity index 100% rename from src/scene/shader-lib/chunks/standard/frag/transmission.js rename to src/scene/shader-lib/chunks-glsl/standard/frag/transmission.js diff --git a/src/scene/shader-lib/programs/lit-shader.js b/src/scene/shader-lib/programs/lit-shader.js index fd3398b4786..96ec72aefe1 100644 --- a/src/scene/shader-lib/programs/lit-shader.js +++ b/src/scene/shader-lib/programs/lit-shader.js @@ -14,10 +14,10 @@ import { cubemaProjectionNames, specularOcclusionNames, reflectionSrcNames, ambientSrcNames, REFLECTIONSRC_NONE } from '../../constants.js'; -import { shaderChunks } from '../chunks/chunks.js'; +import { shaderChunks } from '../chunks-glsl/chunks.js'; import { ChunkUtils } from '../chunk-utils.js'; import { ShaderPass } from '../../shader-pass.js'; -import { validateUserChunks } from '../chunks/chunk-validation.js'; +import { validateUserChunks } from '../chunks-glsl/chunk-validation.js'; import { Debug } from '../../../core/debug.js'; import { shaderChunksWGSL } from '../chunks-wgsl/chunks-wgsl.js'; diff --git a/src/scene/shader-lib/programs/particle.js b/src/scene/shader-lib/programs/particle.js index f3d3b3c7401..eff8fc6738c 100644 --- a/src/scene/shader-lib/programs/particle.js +++ b/src/scene/shader-lib/programs/particle.js @@ -2,7 +2,7 @@ import { SEMANTIC_POSITION, SEMANTIC_TEXCOORD0, SHADERLANGUAGE_GLSL, SHADERLANGU import { ShaderDefinitionUtils } from '../../../platform/graphics/shader-definition-utils.js'; import { blendNames } from '../../constants.js'; import { shaderChunksWGSL } from '../chunks-wgsl/chunks-wgsl.js'; -import { shaderChunks } from '../chunks/chunks.js'; +import { shaderChunks } from '../chunks-glsl/chunks.js'; import { ShaderGenerator } from './shader-generator.js'; const normalTypeNames = [ diff --git a/src/scene/shader-lib/programs/shader-generator-shader.js b/src/scene/shader-lib/programs/shader-generator-shader.js index 95500277e85..c23c308b19d 100644 --- a/src/scene/shader-lib/programs/shader-generator-shader.js +++ b/src/scene/shader-lib/programs/shader-generator-shader.js @@ -2,7 +2,7 @@ import { hashCode } from '../../../core/hash.js'; import { SEMANTIC_ATTR15, SEMANTIC_BLENDINDICES, SEMANTIC_BLENDWEIGHT, SHADERLANGUAGE_GLSL, SHADERLANGUAGE_WGSL } from '../../../platform/graphics/constants.js'; import { ShaderDefinitionUtils } from '../../../platform/graphics/shader-definition-utils.js'; import { shaderChunksWGSL } from '../chunks-wgsl/chunks-wgsl.js'; -import { shaderChunks } from '../chunks/chunks.js'; +import { shaderChunks } from '../chunks-glsl/chunks.js'; import { ShaderGenerator } from './shader-generator.js'; class ShaderGeneratorShader extends ShaderGenerator { diff --git a/src/scene/skybox/sky-mesh.js b/src/scene/skybox/sky-mesh.js index dfc479b435c..172caa7f547 100644 --- a/src/scene/skybox/sky-mesh.js +++ b/src/scene/skybox/sky-mesh.js @@ -4,7 +4,7 @@ import { ShaderMaterial } from '../materials/shader-material.js'; import { MeshInstance } from '../mesh-instance.js'; import { ChunkUtils } from '../shader-lib/chunk-utils.js'; import { shaderChunksWGSL } from '../shader-lib/chunks-wgsl/chunks-wgsl.js'; -import { shaderChunks } from '../shader-lib/chunks/chunks.js'; +import { shaderChunks } from '../shader-lib/chunks-glsl/chunks.js'; import { SkyGeometry } from './sky-geometry.js'; /**