Skip to content

Commit 64378c7

Browse files
RaananWRaananW
committed
fix: correct import formatting and ensure async shader includes load
1 parent f3fc073 commit 64378c7

8 files changed

Lines changed: 20 additions & 20 deletions

File tree

‎packages/dev/core/src/Collisions/gpuPicker.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import type { InstancedMesh } from "core/Meshes/instancedMesh";
1818
import { Logger } from "core/Misc/logger";
1919
import type { Scene } from "core/scene";
2020
import type { Nullable } from "core/types";
21-
import type { Observer } from "core/Misc/observable";
21+
import type { Observer } from "core/Misc/observable";
2222
import { ShaderStore } from "../Engines/shaderStore";
2323

2424
/**
@@ -178,7 +178,7 @@ export class GPUPicker {
178178
} else {
179179
await Promise.all([import("../Shaders/picking.fragment"), import("../Shaders/picking.vertex")]);
180180
}
181-
await ShaderStore.LoadPendingIncludesAsync();
181+
await ShaderStore.LoadPendingIncludesAsync();
182182
},
183183
};
184184

‎packages/dev/core/src/Materials/GaussianSplatting/gaussianSplattingMaterial.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import {
3535
PrepareDefinesForMisc,
3636
PrepareUniformsAndSamplersList,
3737
} from "../materialHelper.functions";
38-
import { ShaderLanguage } from "../shaderLanguage";
38+
import { ShaderLanguage } from "../shaderLanguage";
3939
import { ShaderStore } from "../../Engines/shaderStore";
4040

4141
/**
@@ -341,7 +341,7 @@ export class GaussianSplattingMaterial extends PushMaterial {
341341
} else {
342342
await Promise.all([import("../../Shaders/gaussianSplatting.fragment"), import("../../Shaders/gaussianSplatting.vertex")]);
343343
}
344-
await ShaderStore.LoadPendingIncludesAsync();
344+
await ShaderStore.LoadPendingIncludesAsync();
345345
},
346346
},
347347
engine

‎packages/dev/core/src/Materials/GreasedLine/greasedLineSimpleMaterial.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { TextureSampler } from "../Textures/textureSampler";
1010
import type { GreasedLineMaterialOptions, IGreasedLineMaterial } from "./greasedLineMaterialInterfaces";
1111
import { GreasedLineMeshColorDistributionType, GreasedLineMeshColorMode } from "./greasedLineMaterialInterfaces";
1212
import { GreasedLineTools } from "../../Misc/greasedLineTools";
13-
import { GreasedLineMaterialDefaults } from "./greasedLineMaterialDefaults";
13+
import { GreasedLineMaterialDefaults } from "./greasedLineMaterialDefaults";
1414
import { ShaderStore } from "../../Engines/shaderStore";
1515

1616
export const GreasedLineUseOffsetsSimpleMaterialDefine = "GREASED_LINE_USE_OFFSETS";
@@ -113,7 +113,7 @@ export class GreasedLineSimpleMaterial extends ShaderMaterial implements IGrease
113113
} else {
114114
await Promise.all([import("../../Shaders/greasedLine.vertex"), import("../../Shaders/greasedLine.fragment")]);
115115
}
116-
await ShaderStore.LoadPendingIncludesAsync();
116+
await ShaderStore.LoadPendingIncludesAsync();
117117
},
118118
shaderLanguage: isWGSL ? ShaderLanguage.WGSL : ShaderLanguage.GLSL,
119119
}

‎packages/dev/core/src/Rendering/IBLShadows/iblShadowsAccumulationPass.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import type { IProceduralTextureCreationOptions } from "core/Materials/Textures/
1111
import type { IblShadowsRenderPipeline } from "./iblShadowsRenderPipeline";
1212
import { Observable } from "../../Misc/observable";
1313
import type { EventState } from "../../Misc/observable";
14-
import type { Nullable } from "../../types";
14+
import type { Nullable } from "../../types";
1515
import { ShaderStore } from "../../Engines/shaderStore";
1616

1717
/**
@@ -189,7 +189,7 @@ export class _IblShadowsAccumulationPass {
189189
} else {
190190
await Promise.all([import("../../Shaders/iblShadowAccumulation.fragment")]);
191191
}
192-
await ShaderStore.LoadPendingIncludesAsync();
192+
await ShaderStore.LoadPendingIncludesAsync();
193193
},
194194
};
195195
this._outputTexture = new ProceduralTexture(
@@ -234,7 +234,7 @@ export class _IblShadowsAccumulationPass {
234234
} else {
235235
await Promise.all([import("../../Shaders/pass.fragment")]);
236236
}
237-
await ShaderStore.LoadPendingIncludesAsync();
237+
await ShaderStore.LoadPendingIncludesAsync();
238238
},
239239
};
240240

@@ -267,7 +267,7 @@ export class _IblShadowsAccumulationPass {
267267
} else {
268268
await Promise.all([import("../../Shaders/pass.fragment")]);
269269
}
270-
await ShaderStore.LoadPendingIncludesAsync();
270+
await ShaderStore.LoadPendingIncludesAsync();
271271
},
272272
};
273273

‎packages/dev/core/src/Rendering/boundingBoxRenderer.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import { CreateBoxVertexData } from "../Meshes/Builders/boxBuilder";
2020
import { ShaderLanguage } from "core/Materials/shaderLanguage";
2121
import { Constants } from "../Engines/constants";
2222
import { _RetryWithInterval } from "../Misc/timingTools";
23-
import { Logger } from "../Misc/logger";
23+
import { Logger } from "../Misc/logger";
2424
import { ShaderStore } from "../Engines/shaderStore";
2525

2626
declare module "../scene" {
@@ -321,7 +321,7 @@ export class BoundingBoxRenderer implements ISceneComponent {
321321
} else {
322322
await Promise.all([import("../Shaders/boundingBoxRenderer.vertex"), import("../Shaders/boundingBoxRenderer.fragment")]);
323323
}
324-
await ShaderStore.LoadPendingIncludesAsync();
324+
await ShaderStore.LoadPendingIncludesAsync();
325325
},
326326
},
327327
false
@@ -348,7 +348,7 @@ export class BoundingBoxRenderer implements ISceneComponent {
348348
} else {
349349
await Promise.all([import("../Shaders/boundingBoxRenderer.vertex"), import("../Shaders/boundingBoxRenderer.fragment")]);
350350
}
351-
await ShaderStore.LoadPendingIncludesAsync();
351+
await ShaderStore.LoadPendingIncludesAsync();
352352
},
353353
},
354354
true

‎packages/dev/core/src/Rendering/iblCdfGenerator.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import { _WarnImport } from "../Misc/devTools";
1919
import type { Nullable } from "../types";
2020
import { EngineStore } from "../Engines/engineStore";
2121
import { Logger } from "../Misc/logger";
22-
import { _RetryWithInterval } from "../Misc/timingTools";
22+
import { _RetryWithInterval } from "../Misc/timingTools";
2323
import { ShaderStore } from "../Engines/shaderStore";
2424

2525
/**
@@ -224,7 +224,7 @@ export class IblCdfGenerator {
224224
} else {
225225
await Promise.all([import("../Shaders/iblCdfx.fragment"), import("../Shaders/iblCdfy.fragment"), import("../Shaders/iblScaledLuminance.fragment")]);
226226
}
227-
await ShaderStore.LoadPendingIncludesAsync();
227+
await ShaderStore.LoadPendingIncludesAsync();
228228
},
229229
};
230230
const icdfOptions: IProceduralTextureCreationOptions = {
@@ -241,7 +241,7 @@ export class IblCdfGenerator {
241241
} else {
242242
await Promise.all([import("../Shaders/iblIcdf.fragment"), import("../Shaders/iblDominantDirection.fragment")]);
243243
}
244-
await ShaderStore.LoadPendingIncludesAsync();
244+
await ShaderStore.LoadPendingIncludesAsync();
245245
},
246246
};
247247
this._cdfyPT = new ProceduralTexture("cdfyTexture", { width: size.width, height: size.height + 1 }, "iblCdfy", this._scene, cdfOptions, false, false);

‎packages/dev/core/src/Rendering/outlineRenderer.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { AddClipPlaneUniforms, BindClipPlane, PrepareStringDefinesForClipPlanes
1313
import { BindBonesParameters, BindMorphTargetParameters, PrepareDefinesAndAttributesForMorphTargets, PushAttributesForInstances } from "../Materials/materialHelper.functions";
1414
import { EffectFallbacks } from "core/Materials/effectFallbacks";
1515
import type { IEffectCreationOptions } from "core/Materials/effect";
16-
import { ShaderLanguage } from "core/Materials/shaderLanguage";
16+
import { ShaderLanguage } from "core/Materials/shaderLanguage";
1717
import { ShaderStore } from "../Engines/shaderStore";
1818

1919
declare module "../scene" {
@@ -426,7 +426,7 @@ export class OutlineRenderer implements ISceneComponent {
426426
} else {
427427
await Promise.all([import("../Shaders/outline.fragment"), import("../Shaders/outline.vertex")]);
428428
}
429-
await ShaderStore.LoadPendingIncludesAsync();
429+
await ShaderStore.LoadPendingIncludesAsync();
430430
},
431431
},
432432
this.scene.getEngine()

‎packages/tools/viewer/src/viewer.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ import { SnapshotRenderingHelper } from "core/Misc/snapshotRenderingHelper";
5858
import { _RetryWithInterval } from "core/Misc/timingTools";
5959
import { GetExtensionFromUrl } from "core/Misc/urlTools";
6060
import { Scene } from "core/scene";
61-
import { registerBuiltInLoaders } from "loaders/dynamic";
61+
import { registerBuiltInLoaders } from "loaders/dynamic";
6262
import { ShaderStore } from "core/Engines/shaderStore";
6363

6464
// eslint-disable-next-line @typescript-eslint/promise-function-async
@@ -1957,7 +1957,7 @@ export class Viewer implements IDisposable {
19571957
} else {
19581958
await Promise.all([import("./Shaders/envShadowGround.vertex"), import("./Shaders/envShadowGround.fragment")]);
19591959
}
1960-
await ShaderStore.LoadPendingIncludesAsync();
1960+
await ShaderStore.LoadPendingIncludesAsync();
19611961
},
19621962
};
19631963

0 commit comments

Comments
 (0)