diff --git a/src/effects/BrokenGlass.js b/src/effects/BrokenGlass.js index 7791745..94f7bc3 100644 --- a/src/effects/BrokenGlass.js +++ b/src/effects/BrokenGlass.js @@ -53,7 +53,7 @@ export default class Effect { this.shaderFactory = new ShaderFactory(Effect.getNick(), (shader) => { // Create the texture in the first call. if (!this._shardTexture) { - this._shardTexture = utils.getImageResource('/img/shards.png'); + this._shardTexture = utils.getImageResource('/img/shards.png'); } // Store all uniform locations. diff --git a/src/effects/PaintBrush.js b/src/effects/PaintBrush.js index da9b7b1..d352833 100644 --- a/src/effects/PaintBrush.js +++ b/src/effects/PaintBrush.js @@ -43,7 +43,7 @@ export default class Effect { this.shaderFactory = new ShaderFactory(Effect.getNick(), (shader) => { // Create the texture in the first call. if (!this._brushTexture) { - this._brushTexture = utils.getImageResource('/img/brush.png', true); + this._brushTexture = utils.getImageResource('/img/brush.png', true); } // Store uniform locations of newly created shaders. diff --git a/src/effects/SnapOfDisintegration.js b/src/effects/SnapOfDisintegration.js index 78fcd5e..3bb4417 100644 --- a/src/effects/SnapOfDisintegration.js +++ b/src/effects/SnapOfDisintegration.js @@ -47,7 +47,7 @@ export default class Effect { this.shaderFactory = new ShaderFactory(Effect.getNick(), (shader) => { // Create the texture in the first call. if (!this._dustTexture) { - this._dustTexture = utils.getImageResource('/img/dust.png'); + this._dustTexture = utils.getImageResource('/img/dust.png'); } // Store uniform locations of newly created shaders. diff --git a/src/effects/TRexAttack.js b/src/effects/TRexAttack.js index 04c68f9..3c7f278 100644 --- a/src/effects/TRexAttack.js +++ b/src/effects/TRexAttack.js @@ -43,7 +43,7 @@ export default class Effect { this.shaderFactory = new ShaderFactory(Effect.getNick(), (shader) => { // Create the texture in the first call. if (!this._clawTexture) { - this._clawTexture = utils.getImageResource('/img/claws.png'); + this._clawTexture = utils.getImageResource('/img/claws.png'); } // Store uniform locations of newly created shaders. diff --git a/src/utils.js b/src/utils.js index 72b1de2..c136cf5 100644 --- a/src/utils.js +++ b/src/utils.js @@ -21,9 +21,9 @@ import GLib from 'gi://GLib'; // as in the GNOME Shell process. Some modules are only available or required in one of // these processes. const GdkPixbuf = await importInShellOnly('gi://GdkPixbuf'); -const Clutter = await importInShellOnly('gi://Clutter'); -const Cogl = await importInShellOnly('gi://Cogl'); -const St = await importInShellOnly('gi://St'); +const Clutter = await importInShellOnly('gi://Clutter'); +const Cogl = await importInShellOnly('gi://Cogl'); +const St = await importInShellOnly('gi://St'); // We import the Config module. This is done differently in the GNOME Shell process and in // the preferences process. @@ -121,23 +121,19 @@ export function getStringResource(path) { // Reads the contents of an image file contained in the global resources archive. The data // is returned as a St.ImageContent. -export function getImageResource(path, premultiplied=false) { +export function getImageResource(path, premultiplied = false) { const data = GdkPixbuf.Pixbuf.new_from_resource(path); const texture = St.ImageContent.new_with_preferred_size(data.width, data.height); - const format = data.has_alpha ? (premultiplied ? Cogl.PixelFormat.RGBA_8888_PRE : Cogl.PixelFormat.RGBA_8888) : Cogl.PixelFormat.RGB_888; + const format = data.has_alpha ? + (premultiplied ? Cogl.PixelFormat.RGBA_8888_PRE : Cogl.PixelFormat.RGBA_8888) : + Cogl.PixelFormat.RGB_888; // https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/44b84e458a22046fedb85701ea25ad08ecc0d43f if (shellVersionIsAtLeast(48, 'beta')) { - texture.set_data( - global.stage.context.get_backend().get_cogl_context(), - data.get_pixels(), - format, - data.width, data.height, data.rowstride); + texture.set_data(global.stage.context.get_backend().get_cogl_context(), + data.get_pixels(), format, data.width, data.height, data.rowstride); } else { - texture.set_data( - data.get_pixels(), - format, - data.width, data.height, data.rowstride); + texture.set_data(data.get_pixels(), format, data.width, data.height, data.rowstride); } return texture;