Merge branch 'main' into newMain

src/Shader.js

@@ -59,7 +59,9 @@ export var Shader = GObject.registerClass({
     'end-animation': {}
   }
 },
+
                                           class Shader extends Shell.GLSLEffect {
+
   // --------------------------------------------
   // The constructor automagically loads the shader's source code (in
   // vfunc_build_pipeline()) from the resource file resources/shaders/<nick>.glsl
@@ -207,4 +209,6 @@ export var Shader = GObject.registerClass({
     // Add a trailing newline. Else the GLSL compiler complains...
     return common + '\n' + code + '\n';
   }
-});
+
+});
+

src/ShaderFactory.js

@@ -61,7 +61,7 @@ export default class ShaderFactory {
       // Only try to register the new type once.
       if (GObject.type_from_name(typeName) == null) {
         const outerThis = this;
-        GObject.registerClass({GTypeName: typeName}, class ShaderImp extends Shader {
+        GObject.registerClass({GTypeName: typeName}, class ShaderImp extends Shader{
           // This will actually load the GLSL source code from the resources.
           _init() {
             super._init(outerThis._nick);

src/utils.js

@@ -172,4 +172,6 @@ export function parseColor(string) {
 
 
   return [color.red / 255, color.green / 255, color.blue / 255, color.alpha / 255];
-}
+
+}
+