Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/deprecated/deprecated.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/extras/exporters/core-exporter.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';

/**
Expand Down
2 changes: 1 addition & 1 deletion src/extras/render-passes/render-pass-compose.js
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/extras/render-passes/render-pass-taa.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/extras/renderers/outline-renderer.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';

/**
Expand Down
2 changes: 1 addition & 1 deletion src/framework/lightmapper/lightmap-filters.js
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
2 changes: 1 addition & 1 deletion src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/scene/graphics/reproject-texture.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/scene/gsplat/gsplat-material.js
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/scene/immediate/immediate.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion src/scene/lighting/lights-buffer.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion src/scene/morph-instance.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';

/**
Expand Down
2 changes: 1 addition & 1 deletion src/scene/particle-system/particle-emitter.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/scene/renderer/render-pass-cookie-renderer.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion src/scene/renderer/shadow-renderer.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/scene/shader-lib/chunk-utils.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { shaderChunks } from './chunks/chunks.js';
import { shaderChunks } from './chunks-glsl/chunks.js';

/**
* @import { CameraShaderParams } from '../camera-shader-params.js'
Expand Down
4 changes: 2 additions & 2 deletions src/scene/shader-lib/programs/lit-shader.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion src/scene/shader-lib/programs/particle.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
2 changes: 1 addition & 1 deletion src/scene/shader-lib/programs/shader-generator-shader.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/scene/skybox/sky-mesh.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';

/**
Expand Down