From 8aa8a9082eb362ff8ebe7a86f37d2ce6f155da22 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 30 Oct 2013 17:51:20 +0100 Subject: make-realwallpaper: add usage --- util/bin/make-realwallpaper | 46 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100755 util/bin/make-realwallpaper (limited to 'util') diff --git a/util/bin/make-realwallpaper b/util/bin/make-realwallpaper new file mode 100755 index 00000000..212b1786 --- /dev/null +++ b/util/bin/make-realwallpaper @@ -0,0 +1,46 @@ +#!/bin/sh + +###### USAGE ##### +#run in new directory(will be polluted with images +#just run ./make-realwallpaper + + + +if ! ping -w 10 8.8.8.8 | sed -n '/time=[1-9.]* ms/{p;q}'|grep -q . ; then + echo "we need internet" + exit 1 +fi + +curl -z Nightmap_bare.jpg http://awka.sourceforge.net/Night_le_huge.jpg -o Nightmap_bare.jpg +curl -z Daymap_bare.png http://www.nnvl.noaa.gov/images/globaldata/SnowIceCover_Daily.png -o Daymap_bare.png +curl -z Clouds.jpg http://user.chol.com/~winxplanet/cloud_data/clouds_2048.jpg -o Clouds.jpg + +#resize the Daymap +convert Daymap_bare.png -scale 4000x2000 Daymap.png +#convert Daymap to a snow only alphamap +convert Daymap.png -threshold '95%' Daymap_snowmask.png + +#create a full snowmap in the nightcolor +convert Daymap.png -fill '#0a3b5c' -colorize '100%' Nightmap_fullsnow.png +#get nightlights out of Nightmap_bare +convert Nightmap_bare.jpg -threshold '25%' -transparent '#000000' Nightmap_lightmask.png +#composite Snowmask and Fullsnow to Nightmap_snowlayer +convert Nightmap_fullsnow.png Daymap_snowmask.png -alpha off -compose copy_opacity -composite Nightmap_snowlayer.png +#cut out the lights in Nightmap_lightmask and put them in Nightmap_lightlayer +convert Nightmap_bare.jpg Nightmap_lightmask.png -alpha off -compose copy_opacity -composite Nightmap_lightlayer.png + +#Composite the Nightmap_snowlayer and the Nightmap_lightlayer with the Nightmap +composite Nightmap_lightlayer.png Nightmap_snowlayer.png Nightmap_lightsnowlayer.png +composite Nightmap_lightsnowlayer.png Nightmap_bare.jpg Nightmap.png + +#write the xplanet-configfile +cat > xplanet-config << EOF +[earth] +"Earth" +map=Daymap.png +night_map=Nightmap.png +cloud_map=Clouds.jpg +EOF + +xplanet --num_times 1 --geometry 1366x1200 --output xplanet-output.jpg --projection merc -config xplanet-config +convert xplanet-output.jpg -crop 1366x768+0+160 realwallpaper.png -- cgit v1.2.3 From b53410695a3cba576d7c36292c9e10d9045912bc Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 30 Oct 2013 17:58:43 +0100 Subject: make-realwallpaper removed internetcheck --- util/bin/make-realwallpaper | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'util') diff --git a/util/bin/make-realwallpaper b/util/bin/make-realwallpaper index 212b1786..f6bf9c2f 100755 --- a/util/bin/make-realwallpaper +++ b/util/bin/make-realwallpaper @@ -1,16 +1,10 @@ #!/bin/sh +set -euf ###### USAGE ##### #run in new directory(will be polluted with images #just run ./make-realwallpaper - - -if ! ping -w 10 8.8.8.8 | sed -n '/time=[1-9.]* ms/{p;q}'|grep -q . ; then - echo "we need internet" - exit 1 -fi - curl -z Nightmap_bare.jpg http://awka.sourceforge.net/Night_le_huge.jpg -o Nightmap_bare.jpg curl -z Daymap_bare.png http://www.nnvl.noaa.gov/images/globaldata/SnowIceCover_Daily.png -o Daymap_bare.png curl -z Clouds.jpg http://user.chol.com/~winxplanet/cloud_data/clouds_2048.jpg -o Clouds.jpg -- cgit v1.2.3 From 45ff766f6041493968ddd7a37265fb6baae71dab Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 30 Oct 2013 18:13:54 +0100 Subject: make-realwallpaper less ocean --- util/bin/make-realwallpaper | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'util') diff --git a/util/bin/make-realwallpaper b/util/bin/make-realwallpaper index f6bf9c2f..22e93b96 100755 --- a/util/bin/make-realwallpaper +++ b/util/bin/make-realwallpaper @@ -36,5 +36,5 @@ night_map=Nightmap.png cloud_map=Clouds.jpg EOF -xplanet --num_times 1 --geometry 1366x1200 --output xplanet-output.jpg --projection merc -config xplanet-config -convert xplanet-output.jpg -crop 1366x768+0+160 realwallpaper.png +xplanet --num_times 1 --geometry 1466x1200 --output xplanet-output.jpg --projection merc -config xplanet-config +convert xplanet-output.jpg -crop 1366x768+100+160 realwallpaper.png -- cgit v1.2.3 From 42748584f82c93e674e1c7dc94d90de1f0a364ae Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 30 Oct 2013 18:33:08 +0100 Subject: make-realwallpaper delete files when not image --- util/bin/make-realwallpaper | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'util') diff --git a/util/bin/make-realwallpaper b/util/bin/make-realwallpaper index 22e93b96..07903ac3 100755 --- a/util/bin/make-realwallpaper +++ b/util/bin/make-realwallpaper @@ -5,9 +5,20 @@ set -euf #run in new directory(will be polluted with images #just run ./make-realwallpaper -curl -z Nightmap_bare.jpg http://awka.sourceforge.net/Night_le_huge.jpg -o Nightmap_bare.jpg -curl -z Daymap_bare.png http://www.nnvl.noaa.gov/images/globaldata/SnowIceCover_Daily.png -o Daymap_bare.png -curl -z Clouds.jpg http://user.chol.com/~winxplanet/cloud_data/clouds_2048.jpg -o Clouds.jpg +curl -z Nightmap_bare.jpg http://awka.sourceforge.net/Night_le_huge.jpg -o Nightmap_bare.jpg & +curl -z Daymap_bare.png http://www.nnvl.noaa.gov/images/globaldata/SnowIceCover_Daily.png -o Daymap_bare.png & +curl -z Clouds.jpg http://user.chol.com/~winxplanet/cloud_data/clouds_2048.jpg -o Clouds.jpg & +wait + +if file -ib Nightmap_bare.jpg|grep -q ^image/; then + rm Nightmap_bare.jpg +fi +if file -ib Daymap_bare.png|grep -q ^image/; then + rm Daymap_bare.png +fi +if file -ib Clouds.jpg|grep -q ^image/; then + rm Clouds.jpg +fi #resize the Daymap convert Daymap_bare.png -scale 4000x2000 Daymap.png -- cgit v1.2.3 From c68e5fea30904d22caa40084cac929e976f9cb26 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 30 Oct 2013 18:35:46 +0100 Subject: make-realwallpaper now with exit when no image --- util/bin/make-realwallpaper | 3 +++ 1 file changed, 3 insertions(+) (limited to 'util') diff --git a/util/bin/make-realwallpaper b/util/bin/make-realwallpaper index 07903ac3..9fb4da7d 100755 --- a/util/bin/make-realwallpaper +++ b/util/bin/make-realwallpaper @@ -12,12 +12,15 @@ wait if file -ib Nightmap_bare.jpg|grep -q ^image/; then rm Nightmap_bare.jpg + exit 1 fi if file -ib Daymap_bare.png|grep -q ^image/; then rm Daymap_bare.png + exit 1 fi if file -ib Clouds.jpg|grep -q ^image/; then rm Clouds.jpg + exit 1 fi #resize the Daymap -- cgit v1.2.3