From fc7f1e1fd601d11dfef53bc0dd890bbd6f596f6c Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 2 Nov 2013 16:24:17 +0100 Subject: make-realwallpaper gcloud now 4x faster --- util/bin/make-realwallpaper | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'util') diff --git a/util/bin/make-realwallpaper b/util/bin/make-realwallpaper index f8081337..ba2c6853 100755 --- a/util/bin/make-realwallpaper +++ b/util/bin/make-realwallpaper @@ -173,13 +173,20 @@ make_gcloud_cloudmask() { if needs_rebuild gcloud-normal.png gcloud-raw.png; then echo "make gcloud-normal.png; normalize gcloud-raw.png" >&2 - convert gcloud-raw.png -scale $gcloud_in_size gcloud-normal.png + convert -flatten gcloud-raw.png \ + -scale $gcloud_in_size gcloud-normal.png + fi + + if needs_rebuild gcloud-distmap.png; then + convert -size 2048x2048 gradient: -rotate 180 \ + -fx "p{i, (asinh(tan((j/h+0.5)*pi))/2.6+0.5) * h }" \ + gcloud-distmap.png fi if needs_rebuild gcloud-cloudmask.png gcloud-normal.png; then echo 'make gcloud-cloudmask.png' && - convert -flatten gcloud-normal.png \ - -fx 'p{i,(asinh(tan((j/h+0.5)*pi))/2.6+0.5)*h}' \ + convert gcloud-normal.png gcloud-distmap \ + -fx 'p{i,v*h}' \ -crop $gcloud_out_geometry \ gcloud-cloudmask.png fi -- cgit v1.2.3