summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lassulus@googlemail.com>2013-11-05 19:09:01 +0100
committerlassulus <lassulus@googlemail.com>2013-11-05 19:09:01 +0100
commit2c2266a34d54717da898259888c3f3e2ffb01420 (patch)
tree3ef700558a02f7d27cc7a18e81d55e1802e90003
parenta7004f5241a9c1b8a90cbf48efbe5b9a53f567b5 (diff)
make-realwallpaper: both default and normal vers
-rwxr-xr-xutil/bin/make-realwallpaper60
1 files changed, 55 insertions, 5 deletions
diff --git a/util/bin/make-realwallpaper b/util/bin/make-realwallpaper
index d2ad81aa..84283bb1 100755
--- a/util/bin/make-realwallpaper
+++ b/util/bin/make-realwallpaper
@@ -90,7 +90,8 @@ main() {
map=daymap-final.png
night_map=nightmap-final.png
- cloud_map=gcloud-cloudmask.png
+ cloud_map=clouds-final.png
+ gcloud_map=gcloud-cloudmask.png
satellite_file=krebs.sat
# create xplanet output
@@ -116,6 +117,29 @@ satellite_file=$satellite_file
shade=15
EOF
+ # create xplanet output gcloud version
+ cat >xplanet-gcloud.config <<EOF
+[earth]
+"Earth"
+map=$map
+night_map=$night_map
+cloud_map=$gcloud_map
+cloud_threshold=10
+shade=15
+EOF
+
+ # create xplanet output gcloud-satellite version
+ cat >xplanet-gcloud-sat.config <<EOF
+[earth]
+"Earth"
+map=$map
+night_map=$night_map
+cloud_map=$gcloud_map
+cloud_threshold=10
+satellite_file=$satellite_file
+shade=15
+EOF
+
cat >krebs.sat <<EOF
25544 "ISS" Image=none trail={orbit,-2,2,1} color=grey thickness=1 fontsize=10
37820 "T1" Image=none trail={orbit,-2,2,1} color=grey thickness=1 fontsize=10
@@ -127,20 +151,46 @@ EOF
# rebuild every time to update shadow
xplanet --num_times 1 --geometry $xplanet_out_size \
- --output xplanet-output.png --projection merc -config xplanet.config
+ --output xplanet-output.png --projection merc \
+ -config xplanet.config
# rebuild everytime satellite version
xplanet --num_times 1 --geometry $xplanet_out_size \
- --output xplanet-sat-output.png --projection merc -config xplanet-sat.config
+ --output xplanet-sat-output.png --projection merc \
+ -config xplanet-sat.config
+
+ # rebuild every time to update shadow gcloud
+ xplanet --num_times 1 --geometry $xplanet_out_size \
+ --output xplanet-gcloud-output.png --projection merc \
+ -config xplanet-gcloud.config
+
+ # rebuild everytime satellite gcloud version
+ xplanet --num_times 1 --geometry $xplanet_out_size \
+ --output xplanet-gcloud-sat-output.png --projection merc \
+ -config xplanet-gcloud-sat.config
# trim xplanet output
if needs_rebuild realwallpaper.png xplanet-output.png; then
- convert xplanet-output.png -crop $out_geometry realwallpaper.png
+ convert xplanet-output.png -crop $out_geometry \
+ realwallpaper.png
fi
# trim xplanet-sat output
if needs_rebuild realwallpaper-sat.png xplanet-sat-output.png; then
- convert xplanet-sat-output.png -crop $out_geometry realwallpaper-sat.png
+ convert xplanet-sat-output.png -crop $out_geometry \
+ realwallpaper-sat.png
+ fi
+
+ # trim xplanet output
+ if needs_rebuild realwallpaper-gcloud.png xplanet-gcloud-output.png; then
+ convert xplanet-gcloud-output.png -crop $out_geometry \
+ realwallpaper-gcloud.png
+ fi
+
+ # trim xplanet-sat output
+ if needs_rebuild realwallpaper-gcloud-sat.png xplanet-gcloud-sat-output.png; then
+ convert xplanet-gcloud-sat-output.png -crop $out_geometry \
+ realwallpaper-gcloud-sat.png
fi
}