Merge branch 'main' into newMain

This commit is contained in:
Justin Garza
2025-01-22 18:56:26 -05:00
committed by GitHub
11 changed files with 45 additions and 9 deletions
+5 -1
View File
@@ -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';
}
});
});