From f9c60a483d41289c149f52939bfc0e0680077ff4 Mon Sep 17 00:00:00 2001
From: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com>
Date: Sat, 5 Apr 2025 17:53:13 +1100
Subject: scheme: use material for colour gen

Replaces okolors
Also boost neutral chroma and all chroma
---
 scheme/gen-scheme.fish | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'scheme/gen-scheme.fish')

diff --git a/scheme/gen-scheme.fish b/scheme/gen-scheme.fish
index 0d618ad..7f95001 100755
--- a/scheme/gen-scheme.fish
+++ b/scheme/gen-scheme.fish
@@ -10,16 +10,8 @@ contains -- "$argv[2]" light dark && set -l theme $argv[2] || set -l theme dark
 set -l variants vibrant tonalspot expressive fidelity fruitsalad rainbow neutral content monochrome
 
 # Generate colours
-set -l colours (okolors $img -k 14 -w 0)
+set -l colours ($src/score.py $img)
 for variant in $variants
     mkdir -p $src/../data/schemes/dynamic/$variant
-    $src/autoadjust.py $theme $variant $colours > $src/../data/schemes/dynamic/$variant/$theme.txt
+    $src/autoadjust.py $theme $variant $colours | head -c -1 > $src/../data/schemes/dynamic/$variant/$theme.txt
 end
-
-# Generate layers and accents
-set -l tmp (mktemp)
-$src/genmaterial.py $img $theme > $tmp
-for variant in $variants
-    grep -FA 15 $variant $tmp | tail -15 | head -c -1 >> $src/../data/schemes/dynamic/$variant/$theme.txt
-end
-rm $tmp
-- 
cgit v1.2.3-freya