From 6a65d591445dfb786960254a3d36f0d08912f602 Mon Sep 17 00:00:00 2001 From: Simon Schneegans Date: Fri, 27 May 2022 21:21:05 +0200 Subject: [PATCH] :truck: Rename shader files --- docs/how-to-create-new-effects.md | 2 +- resources/shaders/{apparition.glsl => apparition.frag} | 0 resources/shaders/{broken-glass.glsl => broken-glass.frag} | 0 resources/shaders/{energize-a.glsl => energize-a.frag} | 0 resources/shaders/{energize-b.glsl => energize-b.frag} | 0 resources/shaders/{fire.glsl => fire.frag} | 0 resources/shaders/{hexagon.glsl => hexagon.frag} | 0 resources/shaders/{matrix.glsl => matrix.frag} | 0 resources/shaders/{snap.glsl => snap.frag} | 0 resources/shaders/{trex.glsl => trex.frag} | 0 resources/shaders/{tv.glsl => tv.frag} | 0 resources/shaders/{wisps.glsl => wisps.frag} | 0 src/Shader.js | 2 +- 13 files changed, 2 insertions(+), 2 deletions(-) rename resources/shaders/{apparition.glsl => apparition.frag} (100%) rename resources/shaders/{broken-glass.glsl => broken-glass.frag} (100%) rename resources/shaders/{energize-a.glsl => energize-a.frag} (100%) rename resources/shaders/{energize-b.glsl => energize-b.frag} (100%) rename resources/shaders/{fire.glsl => fire.frag} (100%) rename resources/shaders/{hexagon.glsl => hexagon.frag} (100%) rename resources/shaders/{matrix.glsl => matrix.frag} (100%) rename resources/shaders/{snap.glsl => snap.frag} (100%) rename resources/shaders/{trex.glsl => trex.frag} (100%) rename resources/shaders/{tv.glsl => tv.frag} (100%) rename resources/shaders/{wisps.glsl => wisps.frag} (100%) diff --git a/docs/how-to-create-new-effects.md b/docs/how-to-create-new-effects.md index 7067551..28e1a50 100644 --- a/docs/how-to-create-new-effects.md +++ b/docs/how-to-create-new-effects.md @@ -77,7 +77,7 @@ Just remember to replace `simple-fade` with your custom name! ### 2. Creating the Effect Class -You will have to create a new GLSL file called `resources/shaders/simple-fade.glsl` and a new JavaScript source file called `src/SimpleFade.js`. +You will have to create a new GLSL file called `resources/shaders/simple-fade.frag` and a new JavaScript source file called `src/SimpleFade.js`. Simply paste the following source code to the respective file. Please study this code carefully, all of it is explained with inline comments. diff --git a/resources/shaders/apparition.glsl b/resources/shaders/apparition.frag similarity index 100% rename from resources/shaders/apparition.glsl rename to resources/shaders/apparition.frag diff --git a/resources/shaders/broken-glass.glsl b/resources/shaders/broken-glass.frag similarity index 100% rename from resources/shaders/broken-glass.glsl rename to resources/shaders/broken-glass.frag diff --git a/resources/shaders/energize-a.glsl b/resources/shaders/energize-a.frag similarity index 100% rename from resources/shaders/energize-a.glsl rename to resources/shaders/energize-a.frag diff --git a/resources/shaders/energize-b.glsl b/resources/shaders/energize-b.frag similarity index 100% rename from resources/shaders/energize-b.glsl rename to resources/shaders/energize-b.frag diff --git a/resources/shaders/fire.glsl b/resources/shaders/fire.frag similarity index 100% rename from resources/shaders/fire.glsl rename to resources/shaders/fire.frag diff --git a/resources/shaders/hexagon.glsl b/resources/shaders/hexagon.frag similarity index 100% rename from resources/shaders/hexagon.glsl rename to resources/shaders/hexagon.frag diff --git a/resources/shaders/matrix.glsl b/resources/shaders/matrix.frag similarity index 100% rename from resources/shaders/matrix.glsl rename to resources/shaders/matrix.frag diff --git a/resources/shaders/snap.glsl b/resources/shaders/snap.frag similarity index 100% rename from resources/shaders/snap.glsl rename to resources/shaders/snap.frag diff --git a/resources/shaders/trex.glsl b/resources/shaders/trex.frag similarity index 100% rename from resources/shaders/trex.glsl rename to resources/shaders/trex.frag diff --git a/resources/shaders/tv.glsl b/resources/shaders/tv.frag similarity index 100% rename from resources/shaders/tv.glsl rename to resources/shaders/tv.frag diff --git a/resources/shaders/wisps.glsl b/resources/shaders/wisps.frag similarity index 100% rename from resources/shaders/wisps.glsl rename to resources/shaders/wisps.frag diff --git a/src/Shader.js b/src/Shader.js index 8fa7e14..718179f 100644 --- a/src/Shader.js +++ b/src/Shader.js @@ -106,7 +106,7 @@ var Shader = GObject.registerClass( // Shell.GLSLEffect requires the declarations and the main source code as separate // strings. As it's more convenient to store the in one GLSL file, we use a regex // here to split the source code in two parts. - const code = this._loadShaderResource(`/shaders/${this._nick}.glsl`); + const code = this._loadShaderResource(`/shaders/${this._nick}.frag`); // Match anything between the curly brackets of "void main() {...}". const regex = RegExp('void main *\\(\\) *\\{([\\S\\s]+)\\}');