summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lassulus@googlemail.com>2013-11-02 16:24:17 +0100
committerlassulus <lassulus@googlemail.com>2013-11-02 16:24:17 +0100
commitfc7f1e1fd601d11dfef53bc0dd890bbd6f596f6c (patch)
tree0b0c2ed50ac9e6cddd738ebdd4301a9389238314
parentc8e404282348d02d727bc70f58b3b005a0a9d869 (diff)
make-realwallpaper gcloud now 4x faster
-rwxr-xr-xutil/bin/make-realwallpaper13
1 files changed, 10 insertions, 3 deletions
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