Skip to content

Reorganized folders for chunks and their collections #7695

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 21, 2025
Merged

Reorganized folders for chunks and their collections #7695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0eb05f6
Reorganized folders for chunks and their collections
May 21, 2025
80f6c89
fre more paths fixed
May 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions src/extras/render-passes/render-pass-coc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { SEMANTIC_POSITION, SHADERLANGUAGE_GLSL, SHADERLANGUAGE_WGSL } from '../
import { PROJECTION_ORTHOGRAPHIC } from '../../scene/constants.js';
import { RenderPassShaderQuad } from '../../scene/graphics/render-pass-shader-quad.js';
import { ShaderUtils } from '../../scene/shader-lib/shader-utils.js';
import glslCocPS from '../../scene/shader-lib/chunks-glsl/render-pass/frag/coc.js';
import wgslCocPS from '../../scene/shader-lib/chunks-wgsl/render-pass/frag/coc.js';
import glslCocPS from '../../scene/shader-lib/glsl/chunks/render-pass/frag/coc.js';
import wgslCocPS from '../../scene/shader-lib/wgsl/chunks/render-pass/frag/coc.js';
import { ShaderChunks } from '../../scene/shader-lib/shader-chunks.js';

/**
Expand Down
2 changes: 1 addition & 1 deletion src/extras/render-passes/render-pass-compose.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { GAMMA_NONE, GAMMA_SRGB, gammaNames, TONEMAP_LINEAR, tonemapNames } from
import { ShaderChunks } from '../../scene/shader-lib/shader-chunks.js';
import { SEMANTIC_POSITION, SHADERLANGUAGE_GLSL } from '../../platform/graphics/constants.js';
import { ShaderUtils } from '../../scene/shader-lib/shader-utils.js';
import glslComposePS from '../../scene/shader-lib/chunks-glsl/render-pass/frag/compose.js';
import glslComposePS from '../../scene/shader-lib/glsl/chunks/render-pass/frag/compose.js';

/**
* Render pass implementation of the final post-processing composition.
Expand Down
4 changes: 2 additions & 2 deletions src/extras/render-passes/render-pass-depth-aware-blur.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { SEMANTIC_POSITION, SHADERLANGUAGE_GLSL, SHADERLANGUAGE_WGSL } from '../../platform/graphics/constants.js';
import { RenderPassShaderQuad } from '../../scene/graphics/render-pass-shader-quad.js';
import { ShaderUtils } from '../../scene/shader-lib/shader-utils.js';
import glslDepthAwareBlurPS from '../../scene/shader-lib/chunks-glsl/render-pass/frag/depthAwareBlur.js';
import wgslDepthAwareBlurPS from '../../scene/shader-lib/chunks-wgsl/render-pass/frag/depthAwareBlur.js';
import glslDepthAwareBlurPS from '../../scene/shader-lib/glsl/chunks/render-pass/frag/depthAwareBlur.js';
import wgslDepthAwareBlurPS from '../../scene/shader-lib/wgsl/chunks/render-pass/frag/depthAwareBlur.js';
import { ShaderChunks } from '../../scene/shader-lib/shader-chunks.js';

/**
Expand Down
4 changes: 2 additions & 2 deletions src/extras/render-passes/render-pass-dof-blur.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Kernel } from '../../core/math/kernel.js';
import { SEMANTIC_POSITION, SHADERLANGUAGE_GLSL, SHADERLANGUAGE_WGSL } from '../../platform/graphics/constants.js';
import { RenderPassShaderQuad } from '../../scene/graphics/render-pass-shader-quad.js';
import glsldofBlurPS from '../../scene/shader-lib/chunks-glsl/render-pass/frag/dofBlur.js';
import wgsldofBlurPS from '../../scene/shader-lib/chunks-wgsl/render-pass/frag/dofBlur.js';
import glsldofBlurPS from '../../scene/shader-lib/glsl/chunks/render-pass/frag/dofBlur.js';
import wgsldofBlurPS from '../../scene/shader-lib/wgsl/chunks/render-pass/frag/dofBlur.js';
import { ShaderChunks } from '../../scene/shader-lib/shader-chunks.js';
import { ShaderUtils } from '../../scene/shader-lib/shader-utils.js';

Expand Down
4 changes: 2 additions & 2 deletions src/extras/render-passes/render-pass-downsample.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { SEMANTIC_POSITION, SHADERLANGUAGE_GLSL, SHADERLANGUAGE_WGSL } from '../../platform/graphics/constants.js';
import { RenderPassShaderQuad } from '../../scene/graphics/render-pass-shader-quad.js';
import { ShaderUtils } from '../../scene/shader-lib/shader-utils.js';
import glslDownsamplePS from '../../scene/shader-lib/chunks-glsl/render-pass/frag/downsample.js';
import wgslDownsamplePS from '../../scene/shader-lib/chunks-wgsl/render-pass/frag/downsample.js';
import glslDownsamplePS from '../../scene/shader-lib/glsl/chunks/render-pass/frag/downsample.js';
import wgslDownsamplePS from '../../scene/shader-lib/wgsl/chunks/render-pass/frag/downsample.js';
import { ShaderChunks } from '../../scene/shader-lib/shader-chunks.js';

/**
Expand Down
4 changes: 2 additions & 2 deletions src/extras/render-passes/render-pass-ssao.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import { RenderPassShaderQuad } from '../../scene/graphics/render-pass-shader-qu
import { RenderPassDepthAwareBlur } from './render-pass-depth-aware-blur.js';
import { ShaderChunks } from '../../scene/shader-lib/shader-chunks.js';
import { ShaderUtils } from '../../scene/shader-lib/shader-utils.js';
import glslSsaoPS from '../../scene/shader-lib/chunks-glsl/render-pass/frag/ssao.js';
import wgslSsaoPS from '../../scene/shader-lib/chunks-wgsl/render-pass/frag/ssao.js';
import glslSsaoPS from '../../scene/shader-lib/glsl/chunks/render-pass/frag/ssao.js';
import wgslSsaoPS from '../../scene/shader-lib/wgsl/chunks/render-pass/frag/ssao.js';

/**
* Render pass implementation of Screen-Space Ambient Occlusion (SSAO) based on the non-linear depth
Expand Down
8 changes: 4 additions & 4 deletions src/extras/render-passes/render-pass-taa.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import { RenderPassShaderQuad } from '../../scene/graphics/render-pass-shader-qu
import { RenderTarget } from '../../platform/graphics/render-target.js';
import { PROJECTION_ORTHOGRAPHIC } from '../../scene/constants.js';
import { ShaderUtils } from '../../scene/shader-lib/shader-utils.js';
import glslSampleCatmullRomPS from '../../scene/shader-lib/chunks-glsl/render-pass/frag/sampleCatmullRom.js';
import wgslSampleCatmullRomPS from '../../scene/shader-lib/chunks-wgsl/render-pass/frag/sampleCatmullRom.js';
import glsltaaResolvePS from '../../scene/shader-lib/chunks-glsl/render-pass/frag/taaResolve.js';
import wgsltaaResolvePS from '../../scene/shader-lib/chunks-wgsl/render-pass/frag/taaResolve.js';
import glslSampleCatmullRomPS from '../../scene/shader-lib/glsl/chunks/render-pass/frag/sampleCatmullRom.js';
import wgslSampleCatmullRomPS from '../../scene/shader-lib/wgsl/chunks/render-pass/frag/sampleCatmullRom.js';
import glsltaaResolvePS from '../../scene/shader-lib/glsl/chunks/render-pass/frag/taaResolve.js';
import wgsltaaResolvePS from '../../scene/shader-lib/wgsl/chunks/render-pass/frag/taaResolve.js';
import { ShaderChunks } from '../../scene/shader-lib/shader-chunks.js';

/**
Expand Down
4 changes: 2 additions & 2 deletions src/extras/render-passes/render-pass-upsample.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { SEMANTIC_POSITION, SHADERLANGUAGE_GLSL, SHADERLANGUAGE_WGSL } from '../../platform/graphics/constants.js';
import { RenderPassShaderQuad } from '../../scene/graphics/render-pass-shader-quad.js';
import { ShaderUtils } from '../../scene/shader-lib/shader-utils.js';
import glslUpsamplePS from '../../scene/shader-lib/chunks-glsl/render-pass/frag/upsample.js';
import wgslUpsamplePS from '../../scene/shader-lib/chunks-wgsl/render-pass/frag/upsample.js';
import glslUpsamplePS from '../../scene/shader-lib/glsl/chunks/render-pass/frag/upsample.js';
import wgslUpsamplePS from '../../scene/shader-lib/wgsl/chunks/render-pass/frag/upsample.js';
import { ShaderChunks } from '../../scene/shader-lib/shader-chunks.js';

/**
Expand Down
4 changes: 2 additions & 2 deletions src/framework/app-base.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ import { SceneRegistry } from './scene-registry.js';
import { script } from './script.js';
import { ApplicationStats } from './stats.js';
import { getApplication, setApplication } from './globals.js';
import { shaderChunksGLSL } from '../scene/shader-lib/collections/shader-chunks-glsl.js';
import { shaderChunksWGSL } from '../scene/shader-lib/collections/shader-chunks-wgsl.js';
import { shaderChunksGLSL } from '../scene/shader-lib/glsl/collections/shader-chunks-glsl.js';
import { shaderChunksWGSL } from '../scene/shader-lib/wgsl/collections/shader-chunks-wgsl.js';
import { ShaderChunks } from '../scene/shader-lib/shader-chunks.js';

/**
Expand Down
4 changes: 2 additions & 2 deletions src/framework/components/particle-system/system.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import { Asset } from '../../asset/asset.js';
import { ComponentSystem } from '../system.js';
import { ParticleSystemComponent } from './component.js';
import { ParticleSystemComponentData } from './data.js';
import { particleChunksGLSL } from '../../../scene/shader-lib/collections/particle-chunks-glsl.js';
import { particleChunksWGSL } from '../../../scene/shader-lib/collections/particle-chunks-wgsl.js';
import { particleChunksGLSL } from '../../../scene/shader-lib/glsl/collections/particle-chunks-glsl.js';
import { particleChunksWGSL } from '../../../scene/shader-lib/wgsl/collections/particle-chunks-wgsl.js';
import { SHADERLANGUAGE_GLSL, SHADERLANGUAGE_WGSL } from '../../../platform/graphics/constants.js';
import { ShaderChunks } from '../../../scene/shader-lib/shader-chunks.js';

Expand Down
8 changes: 4 additions & 4 deletions src/framework/lightmapper/lightmap-filters.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { ShaderUtils } from '../../scene/shader-lib/shader-utils.js';
import { SEMANTIC_POSITION, SHADERLANGUAGE_GLSL, SHADERLANGUAGE_WGSL } from '../../platform/graphics/constants.js';
import glslBilateralDeNoisePS from '../../scene/shader-lib/chunks-glsl/lightmapper/frag/bilateralDeNoise.js';
import glslDilatePS from '../../scene/shader-lib/chunks-glsl/lightmapper/frag/dilate.js';
import wgslBilateralDeNoisePS from '../../scene/shader-lib/chunks-wgsl/lightmapper/frag/bilateralDeNoise.js';
import wgslDilatePS from '../../scene/shader-lib/chunks-wgsl/lightmapper/frag/dilate.js';
import glslBilateralDeNoisePS from '../../scene/shader-lib/glsl/chunks/lightmapper/frag/bilateralDeNoise.js';
import glslDilatePS from '../../scene/shader-lib/glsl/chunks/lightmapper/frag/dilate.js';
import wgslBilateralDeNoisePS from '../../scene/shader-lib/wgsl/chunks/lightmapper/frag/bilateralDeNoise.js';
import wgslDilatePS from '../../scene/shader-lib/wgsl/chunks/lightmapper/frag/dilate.js';
import { ShaderChunks } from '../../scene/shader-lib/shader-chunks.js';

// size of the kernel - needs to match the constant in the shader
Expand Down
89 changes: 0 additions & 89 deletions src/scene/shader-lib/collections/particle-chunks-glsl.js
View file
Open in desktop

This file was deleted.

89 changes: 0 additions & 89 deletions src/scene/shader-lib/collections/particle-chunks-wgsl.js
View file
Open in desktop

This file was deleted.

Loading