From 38af6027ee06f4cd8427e515a3492dd5f060db37 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 31 Oct 2013 12:30:25 +0100 Subject: make-realwallpaper: sep. in_size/xplanet_out_size --- util/bin/make-realwallpaper | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'util/bin/make-realwallpaper') diff --git a/util/bin/make-realwallpaper b/util/bin/make-realwallpaper index 437919b5..ec7ca538 100755 --- a/util/bin/make-realwallpaper +++ b/util/bin/make-realwallpaper @@ -24,7 +24,8 @@ main() { check_type daymap-raw.png image check_type clouds-raw.jpg image - in_size=1466x1200 + in_size=2048x1024 + xplanet_out_size=1466x1200 out_geometry=1366x768+100+160 nightsnow_color='#0c1a49' # nightmap @@ -117,11 +118,11 @@ EOF EOF # rebuild every time to update shadow - xplanet --num_times 1 --geometry $in_size \ + xplanet --num_times 1 --geometry $xplanet_out_size \ --output xplanet-output.png --projection merc -config xplanet.config # rebuild everytime satellite version - xplanet --num_times 1 --geometry $in_size \ + xplanet --num_times 1 --geometry $xplanet_out_size \ --output xplanet-sat-output.png --projection merc -config xplanet-sat.config # trim xplanet output -- cgit v1.2.3 From 5e3c03f8657f6666e7f71a31a9444e9db2f659d0 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 31 Oct 2013 12:32:39 +0100 Subject: make-realwallpaper: fix indentation --- util/bin/make-realwallpaper | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'util/bin/make-realwallpaper') diff --git a/util/bin/make-realwallpaper b/util/bin/make-realwallpaper index 30bfa2fa..8187c088 100755 --- a/util/bin/make-realwallpaper +++ b/util/bin/make-realwallpaper @@ -85,7 +85,7 @@ main() { done # create xplanet output - cat >xplanet.config <xplanet.config <xplanet-sat.config <xplanet-sat.config < Date: Fri, 1 Nov 2013 18:33:12 +0100 Subject: make-realwallpaper fetch sat. data in parallel --- util/bin/make-realwallpaper | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'util/bin/make-realwallpaper') diff --git a/util/bin/make-realwallpaper b/util/bin/make-realwallpaper index 8187c088..6e1abf40 100755 --- a/util/bin/make-realwallpaper +++ b/util/bin/make-realwallpaper @@ -16,7 +16,7 @@ main() { fetch clouds-raw.jpg \ http://user.chol.com/~winxplanet/cloud_data/clouds_2048.jpg & fetch krebs.sat.tle \ - http://www.celestrak.com/NORAD/elements/stations.txt + http://www.celestrak.com/NORAD/elements/stations.txt & wait #check_type nightmap-old-raw.jpg image -- cgit v1.2.3 From ff0f82e81b075aca030674af6f3b1bee14a644ff Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 1 Nov 2013 18:36:02 +0100 Subject: make-realwallpaper define maps for *.config once --- util/bin/make-realwallpaper | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'util/bin/make-realwallpaper') diff --git a/util/bin/make-realwallpaper b/util/bin/make-realwallpaper index 6e1abf40..e1e3f5c2 100755 --- a/util/bin/make-realwallpaper +++ b/util/bin/make-realwallpaper @@ -84,13 +84,18 @@ main() { ln $normal $final done + map=daymap-final.png + night_map=nightmap-final.png + cloud_map=clouds-final.png + satellite_file=krebs.sat + # create xplanet output cat >xplanet.config <xplanet-sat.config < Date: Fri, 1 Nov 2013 18:48:05 +0100 Subject: make-realwallpaper add gclouds --- util/bin/make-realwallpaper | 41 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) (limited to 'util/bin/make-realwallpaper') diff --git a/util/bin/make-realwallpaper b/util/bin/make-realwallpaper index e1e3f5c2..14f6b052 100755 --- a/util/bin/make-realwallpaper +++ b/util/bin/make-realwallpaper @@ -84,9 +84,11 @@ main() { ln $normal $final done + make_gcloud_cloudmask + map=daymap-final.png night_map=nightmap-final.png - cloud_map=clouds-final.png + cloud_map=gcloud-cloudmask.png satellite_file=krebs.sat # create xplanet output @@ -143,6 +145,43 @@ EOF && convert xplanet-sat-output.png -crop $out_geometry realwallpaper-sat.png } +# generate clouds from google maps +make_gcloud_cloudmask() { + echo 'fetch gcloud-*.png tiles' >&2 + for y in $(seq -w 0 15); do + for x in $(seq -w 0 15); do + echo "curl -sS -o gcloud-$y-$x.png -z gcloud-$y-$x.png \\\"https://mts0.google.com/vt/lyrs=h@239000000,weather_nolabels,weather_0cloud&hl=en&src=app&x=$x&y=$y&z=4&s=Galil\\\"" + done + done | xargs --max-args=1 -P 10 -I @ sh -c @ + gcloud_tiles=$(find -name 'gcloud-[0-9][0-9]-[0-9][0-9].png'|sort) + needs_rebuild gcloud-raw.png $gcloud_tiles && + echo 'make gcloud-raw.png' && + montage -mode Concatenate -background None \ + $gcloud_tiles -tile x16 gcloud-raw.png + + check_type gcloud-raw.png image + + gcloud_in_size=2048x2048 + gcloud_out_size=2048x1024 + gcloud_out_geometry=2048x1024+0+512 + gcloud_base_color='#ffffff' + + needs_rebuild gcloud-normal.png gcloud-raw.png && + echo "make gcloud-normal.png; normalize gcloud-raw.png" >&2 + convert gcloud-raw.png -scale $gcloud_in_size gcloud-normal.png + + needs_rebuild gcloud-cloudmask.png gcloud-normal.png && + 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}' \ + -crop $gcloud_out_geometry \ + gcloud-cloudmask.png + + needs_rebuild gcloud-fullcloud.png && + echo 'make gcloud-fullcloud.png' && + convert -size $gcloud_out_size xc:$gcloud_base_color gcloud-fullcloud.png +} + # usage: getimg FILENAME URL fetch() { echo "fetch $1" -- cgit v1.2.3 From c8e404282348d02d727bc70f58b3b005a0a9d869 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 2 Nov 2013 15:31:15 +0100 Subject: make-realwallpaper: don't die @!needs_rebuild --- util/bin/make-realwallpaper | 83 ++++++++++++++++++++++++--------------------- 1 file changed, 45 insertions(+), 38 deletions(-) (limited to 'util/bin/make-realwallpaper') diff --git a/util/bin/make-realwallpaper b/util/bin/make-realwallpaper index 14f6b052..f8081337 100755 --- a/util/bin/make-realwallpaper +++ b/util/bin/make-realwallpaper @@ -40,24 +40,26 @@ main() { ; do normal=${raw%-raw.*}.png - needs_rebuild $normal $raw || continue - echo "make $normal; normalize $raw" >&2 - convert $raw -scale $in_size $normal + if needs_rebuild $normal $raw; then + echo "make $normal; normalize $raw" >&2 + convert $raw -scale $in_size $normal + fi done # create nightmap-fullsnow - needs_rebuild nightmap-fullsnow.png \ - && convert -size $in_size xc:$nightsnow_color nightmap-fullsnow.png + if needs_rebuild nightmap-fullsnow.png; then + convert -size $in_size xc:$nightsnow_color nightmap-fullsnow.png + fi # extract daymap-snowmask from daymap-final - needs_rebuild daymap-snowmask.png \ - daymap.png \ - && convert daymap.png -threshold 95% daymap-snowmask.png + if needs_rebuild daymap-snowmask.png daymap.png; then + convert daymap.png -threshold 95% daymap-snowmask.png + fi # extract nightmap-lightmask from nightmap - needs_rebuild nightmap-lightmask.png \ - nightmap.png \ - && convert nightmap.png -threshold 25% nightmap-lightmask.png + if needs_rebuild nightmap-lightmask.png nightmap.png; then + convert nightmap.png -threshold 25% nightmap-lightmask.png + fi # create layers make_layer nightmap-snowlayer.png nightmap-fullsnow.png daymap-snowmask.png @@ -114,17 +116,19 @@ satellite_file=$satellite_file shade=15 EOF - needs_rebuild krebs.sat \ - && cat >krebs.sat <krebs.sat <krebs.mar <krebs.mar <&2 - convert gcloud-raw.png -scale $gcloud_in_size gcloud-normal.png + 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 + fi - needs_rebuild gcloud-cloudmask.png gcloud-normal.png && - 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}' \ - -crop $gcloud_out_geometry \ - gcloud-cloudmask.png + 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}' \ + -crop $gcloud_out_geometry \ + gcloud-cloudmask.png + fi - needs_rebuild gcloud-fullcloud.png && - echo 'make gcloud-fullcloud.png' && - convert -size $gcloud_out_size xc:$gcloud_base_color gcloud-fullcloud.png + if needs_rebuild gcloud-fullcloud.png; then + echo 'make gcloud-fullcloud.png' && + convert -size $gcloud_out_size xc:$gcloud_base_color gcloud-fullcloud.png + fi } # usage: getimg FILENAME URL @@ -240,5 +248,4 @@ needs_rebuild() { return $result } - main "$@" -- cgit v1.2.3 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/bin/make-realwallpaper') 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