diff --git a/packages/renderer/webgl2/3d-preview/environment-map.ts b/packages/renderer/webgl2/3d-preview/environment-map.ts index b766353..f29fef1 100644 --- a/packages/renderer/webgl2/3d-preview/environment-map.ts +++ b/packages/renderer/webgl2/3d-preview/environment-map.ts @@ -1,5 +1,5 @@ import hdrjs from "hdr.js"; -import fullscreenQuadVertGlsl from "../../../../resources/glsl/fullscreen.vert.glsl?raw"; +import fullscreenQuadVertGlsl from "../../../../resources/glsl/fullscreen.vs?raw"; import brdfLookupFragGlsl from "../../../../resources/glsl/preview/brdf-lookup.fs?raw"; import hdrToCubemapFragGlsl from "../../../../resources/glsl/preview/hdr-to-cubemap.fs?raw"; import hdrToCubemapVertGlsl from "../../../../resources/glsl/preview/hdr-to-cubemap.vs?raw"; diff --git a/packages/renderer/webgl2/3d-preview/postprocess-pass.ts b/packages/renderer/webgl2/3d-preview/postprocess-pass.ts index d20f86a..cd2054b 100644 --- a/packages/renderer/webgl2/3d-preview/postprocess-pass.ts +++ b/packages/renderer/webgl2/3d-preview/postprocess-pass.ts @@ -1,4 +1,4 @@ -import fxaaVertGlsl from "../../../../resources/glsl/fullscreen.vert.glsl?raw"; +import fxaaVertGlsl from "../../../../resources/glsl/fullscreen.vs?raw"; import fxaaFragGlsl from "../../../../resources/glsl/preview/fxaa.fs?raw"; import ShaderProgram from "../shader/program"; diff --git a/packages/renderer/webgl2/editor-ui-renderer.ts b/packages/renderer/webgl2/editor-ui-renderer.ts index 58a1065..7ff78e3 100644 --- a/packages/renderer/webgl2/editor-ui-renderer.ts +++ b/packages/renderer/webgl2/editor-ui-renderer.ts @@ -1,6 +1,6 @@ import * as glMatrix from "gl-matrix"; -import fragGlsl from "../../../resources/glsl/editor-ui.frag.glsl?raw"; -import vertGlsl from "../../../resources/glsl/editor-ui.vert.glsl?raw"; +import fragGlsl from "../../../resources/glsl/editor-ui.fs?raw"; +import vertGlsl from "../../../resources/glsl/editor-ui.vs?raw"; import { XY_QUAD_VERTICES } from "../quads"; import { MaterialNodeSnapshot, MaterialSnapshot } from "../types"; import WebGLNodeRenderer from "./node-renderer"; diff --git a/packages/renderer/webgl2/painters/glsl-single-pass.ts b/packages/renderer/webgl2/painters/glsl-single-pass.ts index 77b657a..3b2bbc1 100644 --- a/packages/renderer/webgl2/painters/glsl-single-pass.ts +++ b/packages/renderer/webgl2/painters/glsl-single-pass.ts @@ -1,4 +1,4 @@ -import vertShaderCode from "../../../../resources/glsl/fullscreen.vert.glsl?raw"; +import vertShaderCode from "../../../../resources/glsl/fullscreen.vs?raw"; import { GlslPainterInfo } from "../../../material/node-painter"; import ShaderProgram from "../shader/program"; import { WebGLNodePaintContext } from "./context"; diff --git a/packages/renderer/webgl2/painters/glsl-two-pass.ts b/packages/renderer/webgl2/painters/glsl-two-pass.ts index 2fb59e6..766010d 100644 --- a/packages/renderer/webgl2/painters/glsl-two-pass.ts +++ b/packages/renderer/webgl2/painters/glsl-two-pass.ts @@ -1,4 +1,4 @@ -import vertShaderCode from "../../../../resources/glsl/fullscreen.vert.glsl?raw"; +import vertShaderCode from "../../../../resources/glsl/fullscreen.vs?raw"; import { TwoPassGlslPainterInfo } from "../../../material/node-painter"; import TextureFilterMethod from "../../../types/texture-filter"; import BoundShaderProgram from "../shader/bound-program"; diff --git a/packages/renderer/webgl2/painters/pattern.ts b/packages/renderer/webgl2/painters/pattern.ts index d459e56..7c14d2a 100644 --- a/packages/renderer/webgl2/painters/pattern.ts +++ b/packages/renderer/webgl2/painters/pattern.ts @@ -1,6 +1,6 @@ import * as glMatrix from "gl-matrix"; -import fragShaderCode from "../../../../resources/glsl/fullscreen-instanced.frag.glsl?raw"; -import vertShaderCode from "../../../../resources/glsl/fullscreen-instanced.vert.glsl?raw"; +import fragShaderCode from "../../../../resources/glsl/fullscreen-instanced.fs?raw"; +import vertShaderCode from "../../../../resources/glsl/fullscreen-instanced.vs?raw"; import BlendMode from "../../../types/blend-mode"; import { XY_QUAD_VERTICES } from "../../quads"; import { MaterialNodeSnapshot } from "../../types"; diff --git a/resources/glsl/editor-ui.frag.glsl b/resources/glsl/editor-ui.fs similarity index 100% rename from resources/glsl/editor-ui.frag.glsl rename to resources/glsl/editor-ui.fs diff --git a/resources/glsl/editor-ui.vert.glsl b/resources/glsl/editor-ui.vs similarity index 100% rename from resources/glsl/editor-ui.vert.glsl rename to resources/glsl/editor-ui.vs diff --git a/resources/glsl/fullscreen-instanced.frag.glsl b/resources/glsl/fullscreen-instanced.fs similarity index 100% rename from resources/glsl/fullscreen-instanced.frag.glsl rename to resources/glsl/fullscreen-instanced.fs diff --git a/resources/glsl/fullscreen-instanced.vert.glsl b/resources/glsl/fullscreen-instanced.vs similarity index 100% rename from resources/glsl/fullscreen-instanced.vert.glsl rename to resources/glsl/fullscreen-instanced.vs diff --git a/resources/glsl/fullscreen.vert.glsl b/resources/glsl/fullscreen.vs similarity index 100% rename from resources/glsl/fullscreen.vert.glsl rename to resources/glsl/fullscreen.vs diff --git a/resources/nodes/base/blend.glsl b/resources/nodes/base/blend.fs similarity index 100% rename from resources/nodes/base/blend.glsl rename to resources/nodes/base/blend.fs diff --git a/resources/nodes/base/blend.ts b/resources/nodes/base/blend.ts index 0bef1de..7de1ebf 100644 --- a/resources/nodes/base/blend.ts +++ b/resources/nodes/base/blend.ts @@ -1,6 +1,6 @@ import BlendMode from "../../../packages/types/blend-mode"; import { MaterialNodeBlueprint } from "../../../packages/material/node"; -import glsl from "./blend.glsl?raw"; +import glsl from "./blend.fs?raw"; export default { id: "blend", diff --git a/resources/nodes/base/output.glsl b/resources/nodes/base/output.fs similarity index 100% rename from resources/nodes/base/output.glsl rename to resources/nodes/base/output.fs diff --git a/resources/nodes/base/output.ts b/resources/nodes/base/output.ts index 88f19d4..5d5942e 100644 --- a/resources/nodes/base/output.ts +++ b/resources/nodes/base/output.ts @@ -1,6 +1,6 @@ import { MaterialNodeBlueprint } from "../../../packages/material/node"; import { PbrTargetTextureType } from "../../../packages/types/pbr"; -import glsl from "./output.glsl?raw"; +import glsl from "./output.fs?raw"; export default { id: "output", diff --git a/resources/nodes/blur/gaussian.glsl b/resources/nodes/blur/gaussian.fs similarity index 100% rename from resources/nodes/blur/gaussian.glsl rename to resources/nodes/blur/gaussian.fs diff --git a/resources/nodes/blur/gaussian.ts b/resources/nodes/blur/gaussian.ts index db30222..c3eb5c4 100644 --- a/resources/nodes/blur/gaussian.ts +++ b/resources/nodes/blur/gaussian.ts @@ -1,5 +1,5 @@ import { MaterialNodeBlueprint } from "../../../packages/material/node"; -import glsl from "./gaussian.glsl?raw"; +import glsl from "./gaussian.fs?raw"; export default { id: "gaussian-blur", diff --git a/resources/nodes/generate/linear-gradient.glsl b/resources/nodes/generate/linear-gradient.fs similarity index 100% rename from resources/nodes/generate/linear-gradient.glsl rename to resources/nodes/generate/linear-gradient.fs diff --git a/resources/nodes/generate/linear-gradient.ts b/resources/nodes/generate/linear-gradient.ts index fc8315e..c50ed73 100644 --- a/resources/nodes/generate/linear-gradient.ts +++ b/resources/nodes/generate/linear-gradient.ts @@ -1,5 +1,5 @@ import { MaterialNodeBlueprint } from "../../../packages/material/node"; -import glsl from "./linear-gradient.glsl?raw"; +import glsl from "./linear-gradient.fs?raw"; export default { id: "gradient", diff --git a/resources/nodes/generate/solid-color.glsl b/resources/nodes/generate/solid-color.fs similarity index 100% rename from resources/nodes/generate/solid-color.glsl rename to resources/nodes/generate/solid-color.fs diff --git a/resources/nodes/generate/solid-color.ts b/resources/nodes/generate/solid-color.ts index 3452c0a..0d11a63 100644 --- a/resources/nodes/generate/solid-color.ts +++ b/resources/nodes/generate/solid-color.ts @@ -1,5 +1,5 @@ import { MaterialNodeBlueprint } from "../../../packages/material/node"; -import glsl from "./solid-color.glsl?raw"; +import glsl from "./solid-color.fs?raw"; export default { id: "solid-color", diff --git a/resources/nodes/layout/transform.glsl b/resources/nodes/layout/transform.fs similarity index 100% rename from resources/nodes/layout/transform.glsl rename to resources/nodes/layout/transform.fs diff --git a/resources/nodes/layout/transform.ts b/resources/nodes/layout/transform.ts index cd544f5..5b6a6f6 100644 --- a/resources/nodes/layout/transform.ts +++ b/resources/nodes/layout/transform.ts @@ -1,5 +1,5 @@ import { MaterialNodeBlueprint } from "../../../packages/material/node"; -import glsl from "./transform.glsl?raw"; +import glsl from "./transform.fs?raw"; export default { id: "transform", diff --git a/resources/nodes/noises/anisotropic.glsl b/resources/nodes/noises/anisotropic.fs similarity index 100% rename from resources/nodes/noises/anisotropic.glsl rename to resources/nodes/noises/anisotropic.fs diff --git a/resources/nodes/noises/anisotropic.ts b/resources/nodes/noises/anisotropic.ts index d7181ef..bf510be 100644 --- a/resources/nodes/noises/anisotropic.ts +++ b/resources/nodes/noises/anisotropic.ts @@ -1,5 +1,5 @@ import { MaterialNodeBlueprint } from "../../../packages/material/node"; -import glsl from "./anisotropic.glsl?raw"; +import glsl from "./anisotropic.fs?raw"; export default { id: "anisotropic-noise", diff --git a/resources/nodes/utilities/floor.glsl b/resources/nodes/utilities/floor.fs similarity index 100% rename from resources/nodes/utilities/floor.glsl rename to resources/nodes/utilities/floor.fs diff --git a/resources/nodes/utilities/floor.ts b/resources/nodes/utilities/floor.ts index 62c68c0..81db383 100644 --- a/resources/nodes/utilities/floor.ts +++ b/resources/nodes/utilities/floor.ts @@ -1,5 +1,5 @@ import { MaterialNodeBlueprint } from "../../../packages/material/node"; -import glsl from "./floor.glsl?raw"; +import glsl from "./floor.fs?raw"; export default { id: "floor", diff --git a/resources/nodes/utilities/invert.glsl b/resources/nodes/utilities/invert.fs similarity index 100% rename from resources/nodes/utilities/invert.glsl rename to resources/nodes/utilities/invert.fs diff --git a/resources/nodes/utilities/invert.ts b/resources/nodes/utilities/invert.ts index 2ce9d6a..0ff9892 100644 --- a/resources/nodes/utilities/invert.ts +++ b/resources/nodes/utilities/invert.ts @@ -1,5 +1,5 @@ import { MaterialNodeBlueprint } from "../../../packages/material/node"; -import glsl from "./invert.glsl?raw"; +import glsl from "./invert.fs?raw"; export default { id: "invert", diff --git a/resources/nodes/utilities/pass-through.glsl b/resources/nodes/utilities/pass-through.fs similarity index 100% rename from resources/nodes/utilities/pass-through.glsl rename to resources/nodes/utilities/pass-through.fs diff --git a/resources/nodes/utilities/pass-through.ts b/resources/nodes/utilities/pass-through.ts index 46d99e3..4c49d68 100644 --- a/resources/nodes/utilities/pass-through.ts +++ b/resources/nodes/utilities/pass-through.ts @@ -1,5 +1,5 @@ import { MaterialNodeBlueprint } from "../../../packages/material/node"; -import glsl from "./pass-through.glsl?raw"; +import glsl from "./pass-through.fs?raw"; export default { id: "passthrough",