Skip to content

Commit

Permalink
Rename shaders from .glsl to .vs/.fs
Browse files Browse the repository at this point in the history
  • Loading branch information
adamwych committed Nov 19, 2023
1 parent 8a8620f commit 278fccc
Show file tree
Hide file tree
Showing 31 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion packages/renderer/webgl2/3d-preview/environment-map.ts
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion packages/renderer/webgl2/3d-preview/postprocess-pass.ts
Original file line number Diff line number Diff line change
@@ -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";

Expand Down
4 changes: 2 additions & 2 deletions packages/renderer/webgl2/editor-ui-renderer.ts
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion packages/renderer/webgl2/painters/glsl-single-pass.ts
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion packages/renderer/webgl2/painters/glsl-two-pass.ts
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
4 changes: 2 additions & 2 deletions packages/renderer/webgl2/painters/pattern.ts
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion resources/nodes/base/blend.ts
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion resources/nodes/base/output.ts
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion resources/nodes/blur/gaussian.ts
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion resources/nodes/generate/linear-gradient.ts
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion resources/nodes/generate/solid-color.ts
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion resources/nodes/layout/transform.ts
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion resources/nodes/noises/anisotropic.ts
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion resources/nodes/utilities/floor.ts
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion resources/nodes/utilities/invert.ts
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion resources/nodes/utilities/pass-through.ts
Original file line number Diff line number Diff line change
@@ -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",
Expand Down

0 comments on commit 278fccc

Please sign in to comment.