From 44b1dcc331c69e54379727108e9bdd842bcb7930 Mon Sep 17 00:00:00 2001 From: Bauke Date: Thu, 10 Mar 2022 18:34:26 +0100 Subject: [PATCH] Replace Generic with properly implemented versions. --- source/2022-03-07.ts | 29 +++++++++++++++++++---------- source/2022-03-08.ts | 7 ++++--- source/2022-03-09.ts | 20 +++++++++++++++----- source/2022-03-10.ts | 6 +++--- 4 files changed, 41 insertions(+), 21 deletions(-) diff --git a/source/2022-03-07.ts b/source/2022-03-07.ts index 469af92..88bd293 100644 --- a/source/2022-03-07.ts +++ b/source/2022-03-07.ts @@ -1,4 +1,13 @@ -import {Crop, Generic, Mirrors, Plasma} from './gegl/exports.js'; +import { + Cartoon, + Crop, + MedianBlur, + Mirrors, + Mosaic, + Plasma, + Waterpixels, + Waves, +} from './gegl/exports.js'; import Project from './project.js'; const [width, height] = [1920, 1080]; @@ -13,22 +22,22 @@ const project: Project = { turbulence: 1, width, }), - new Generic('gegl:mosaic', { + new Mosaic({ colorVariation: 1, tileHeight: 5, tileNeatness: 1, tileSize: 116.53, - tileSurface: 'true', + tileSurface: true, tileType: 'triangles', }), - new Generic('gegl:waves', { + new Waves({ amplitude: 2.9, - clamp: 'true', + clamp: true, samplerType: 'cubic', }), - new Generic('gegl:waves', { + new Waves({ amplitude: 17.3, - clamp: 'true', + clamp: true, samplerType: 'cubic', }), new Mirrors({ @@ -36,9 +45,9 @@ const project: Project = { oY: 0.353, nSegs: 2, }), - new Generic('gegl:cartoon'), + new Cartoon(), new Crop({height, width}), - new Generic('gegl:waterpixels', { + new Waterpixels({ fill: 'average', size: 32, smoothness: 1, @@ -49,7 +58,7 @@ const project: Project = { nSegs: 5, rAngle: 342, }), - new Generic('gegl:median-blur'), + new MedianBlur(), ], resetAlpha: false, resolution: { diff --git a/source/2022-03-08.ts b/source/2022-03-08.ts index 9432d4a..a67e610 100644 --- a/source/2022-03-08.ts +++ b/source/2022-03-08.ts @@ -1,9 +1,10 @@ import { Crop, - Generic, + DiffractionPatterns, FocusBlur, Newsprint, StereographicProjection, + TileSeamless, } from './gegl/exports.js'; import Project from './project.js'; @@ -13,12 +14,12 @@ const project: Project = { createInputImage: false, name: '2022-03-08', operations: [ - new Generic('gegl:diffraction-patterns', { + new DiffractionPatterns({ height, width, }), new Crop({height, width}), - new Generic('gegl:tile-seamless'), + new TileSeamless(), new StereographicProjection(), new Newsprint({ colorModel: 'cmyk', diff --git a/source/2022-03-09.ts b/source/2022-03-09.ts index 154876d..b145162 100644 --- a/source/2022-03-09.ts +++ b/source/2022-03-09.ts @@ -1,4 +1,14 @@ -import {Crop, FocusBlur, Generic, Mirrors, Newsprint} from './gegl/exports.js'; +import { + Crop, + FocusBlur, + Generic, + MedianBlur, + Mirrors, + Newsprint, + TileSeamless, + Waterpixels, + Waves, +} from './gegl/exports.js'; import Project from './project.js'; const [width, height] = [1920, 1080]; @@ -9,21 +19,21 @@ const project: Project = { operations: [ new Generic('gegl:maze'), new Generic('gegl:tile-glass'), - new Generic('gegl:waterpixels'), + new Waterpixels(), new Newsprint({ angle2: -55.4, angle3: 60.77, angle4: 103.55, colorModel: 'rgb', }), - new Generic('gegl:waves', { + new Waves({ amplitude: 5.9, clamp: true, }), new Crop({height, width}), new Generic('gegl:oilify'), - new Generic('gegl:tile-seamless'), - new Generic('gegl:median-blur', { + new TileSeamless(), + new MedianBlur({ percentile: 2.35, }), new Mirrors({ diff --git a/source/2022-03-10.ts b/source/2022-03-10.ts index a57d953..9c1fe3b 100644 --- a/source/2022-03-10.ts +++ b/source/2022-03-10.ts @@ -1,4 +1,4 @@ -import {Crop, Generic, Newsprint} from './gegl/exports.js'; +import {CellNoise, Crop, Generic, Newsprint, Waves} from './gegl/exports.js'; import Project from './project.js'; const [width, height] = [3840, 2160]; @@ -7,7 +7,7 @@ const project: Project = { createInputImage: false, name: '2022-03-10', operations: [ - new Generic('gegl:cell-noise', { + new CellNoise({ scale: 0.5, seed: 2_762_328_325, }), @@ -22,7 +22,7 @@ const project: Project = { period4: 135.1, turbulence: 0.454, }), - new Generic('gegl:waves', { + new Waves({ amplitude: 67.6, clamp: true, period: 514.8,