From b48d764d6dcd160a89e391cc88c7e862de39695b Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@googlemail.com>
Date: Tue, 5 Nov 2013 18:54:51 +0100
Subject: make-realwallpaper: always write config files

---
 util/bin/make-realwallpaper | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'util/bin')

diff --git a/util/bin/make-realwallpaper b/util/bin/make-realwallpaper
index ba2c6853..292f203b 100755
--- a/util/bin/make-realwallpaper
+++ b/util/bin/make-realwallpaper
@@ -116,19 +116,15 @@ satellite_file=$satellite_file
 shade=15
 EOF
 
-  if needs_rebuild krebs.sat; then
-    cat >krebs.sat <<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
 39175 "ATV-4" Image=none trail={orbit,-2,2,1} color=grey thickness=1 fontsize=10
 39258 "CYG" Image=none trail={orbit,-2,2,1} color=grey thickness=1 fontsize=10
 EOF
-  fi
 
-  if needs_rebuild krebs.mar; then
-    cat >krebs.mar <<EOF
+  cat >krebs.mar <<EOF
 EOF
-  fi
 
   # rebuild every time to update shadow
   xplanet --num_times 1 --geometry $xplanet_out_size \
-- 
cgit v1.2.3


From a7004f5241a9c1b8a90cbf48efbe5b9a53f567b5 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@googlemail.com>
Date: Tue, 5 Nov 2013 18:56:57 +0100
Subject: make-realwallpaper: removed ATV-4 from sats

---
 util/bin/make-realwallpaper | 1 -
 1 file changed, 1 deletion(-)

(limited to 'util/bin')

diff --git a/util/bin/make-realwallpaper b/util/bin/make-realwallpaper
index 292f203b..d2ad81aa 100755
--- a/util/bin/make-realwallpaper
+++ b/util/bin/make-realwallpaper
@@ -119,7 +119,6 @@ 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
-39175 "ATV-4" Image=none trail={orbit,-2,2,1} color=grey thickness=1 fontsize=10
 39258 "CYG" Image=none trail={orbit,-2,2,1} color=grey thickness=1 fontsize=10
 EOF
 
-- 
cgit v1.2.3


From 2c2266a34d54717da898259888c3f3e2ffb01420 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@googlemail.com>
Date: Tue, 5 Nov 2013 19:09:01 +0100
Subject: make-realwallpaper: both default and normal vers

---
 util/bin/make-realwallpaper | 60 +++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 55 insertions(+), 5 deletions(-)

(limited to 'util/bin')

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
@@ -114,6 +115,29 @@ cloud_map=$cloud_map
 cloud_threshold=10
 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
@@ -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
 }
 
-- 
cgit v1.2.3


From 1d69388a39964c67a2e17483084565279e1fb550 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@googlemail.com>
Date: Tue, 5 Nov 2013 19:21:07 +0100
Subject: make-realwallpaper fixed gcloud-distmap

---
 util/bin/make-realwallpaper | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'util/bin')

diff --git a/util/bin/make-realwallpaper b/util/bin/make-realwallpaper
index 84283bb1..837bd378 100755
--- a/util/bin/make-realwallpaper
+++ b/util/bin/make-realwallpaper
@@ -230,7 +230,7 @@ make_gcloud_cloudmask() {
 
   if needs_rebuild gcloud-cloudmask.png gcloud-normal.png; then
     echo 'make gcloud-cloudmask.png' &&
-    convert gcloud-normal.png gcloud-distmap \
+    convert gcloud-normal.png gcloud-distmap.png \
       -fx 'p{i,v*h}' \
       -crop $gcloud_out_geometry \
       gcloud-cloudmask.png
-- 
cgit v1.2.3