diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4345320 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +images/maps/clouds-alpha.jpg +images/maps/clouds-alpha.jpg.etag +images/renders/* diff --git a/DP-2 b/DP-2 deleted file mode 100644 index 2f882ca..0000000 Binary files a/DP-2 and /dev/null differ diff --git a/clouds-alpha.png b/clouds-alpha.png deleted file mode 100644 index 48172fc..0000000 Binary files a/clouds-alpha.png and /dev/null differ diff --git a/compile.sh b/compile.sh index 0bfe298..72e1aaa 100755 --- a/compile.sh +++ b/compile.sh @@ -1,11 +1,14 @@ #!/usr/bin/env bash WORK_DIR="$HOME/.config/scripts/live-earth-wallpaper" -OUTPUT_IMG_DIR="$WORK_DIR/images" -CLOUD_SRC_IMG="$OUTPUT_IMG_DIR/clouds-alpha.jpg" -OUTPUT_IMG_ULTRAWIDE="$OUTPUT_IMG_DIR/DP-2-render.png" -OUTPUT_IMG_EDP="$OUTPUT_IMG_DIR/eDP-1-render.png" -OUTPUT_IMG_ULTRAWIDE_NATIVE="$OUTPUT_IMG_DIR/blue-ULTRAWIDE-native.png" +OUTPUT_IMG_DIR="$WORK_DIR" +IMG_DIR="$WORK_DIR/images" +MAP_DIR="$IMG_DIR/maps" +OUTPUT_RENDER_DIR="$IMG_DIR/renders" +CLOUD_SRC_IMG="$MAP_DIR/clouds-alpha.jpg" +OUTPUT_IMG_ULTRAWIDE="$OUTPUT_RENDER_DIR/DP-2-render.png" +OUTPUT_IMG_EDP="$OUTPUT_RENDER_DIR/eDP-1-render.png" +OUTPUT_IMG_ULTRAWIDE_NATIVE="$OUTPUT_RENDER_DIR/blue-ULTRAWIDE-native.png" # OUTPUT_IMG_STARFNATIVE="$OUTPUT_IMG_DIR/stars-native.png" STARS_FILE="/usr/share/xplanet/stars/BSC" STATIONS_TLE="$WORK_DIR/stations.tle" @@ -21,8 +24,8 @@ downloadClouds "$CLOUD_SRC_IMG" || exit # Download latest clouds image or exit w # downloadStations # Download latest stations data -cacheImages "eDP-1" "$OUTPUT_IMG_DIR" # Check for existing images and cache them if they exist -cacheImages "DP-2" "$OUTPUT_IMG_DIR" # Check for existing images and cache them if they exist +cacheImages "eDP-1" "$OUTPUT_RENDER_DIR" # Check for existing images and cache them if they exist +cacheImages "DP-2" "$OUTPUT_RENDER_DIR" # Check for existing images and cache them if they exist # TODO handle errors here @@ -73,6 +76,8 @@ if [[ "$monitors" == *"DP-2"* ]]; then && echo render ultrawide wallpaper superize successful || exit 1 # echo Error: failed to render ultrawide wallpaper at super resolution noctalia msg wallpaper-set DP-2 "$OUTPUT_IMG_ULTRAWIDE" 1>/dev/null && echo ultrawide wallpaper set successfully || echo Warning: not connected to monitor DP-2, wallpaper will not be set. + rm "$OUTPUT_IMG_ULTRAWIDE_NATIVE" # Remove the native resolution image after the supersampled image is created + rm "$OUTPUT_IMG_ULTRAWIDE.tmp" # Remove the cached image after the new image is created fi if [[ "$monitors" == *"eDP-1"* ]]; then # TODO: technicall no if statement needed here, should be functional tho echo "Builtin monitor detected" @@ -83,8 +88,5 @@ if [[ "$monitors" == *"eDP-1"* ]]; then # TODO: technicall no if statement neede && echo render builtin wallpaper successful || exit 1 # echo Error: failed to render builtin wallpaper noctalia msg wallpaper-set eDP-1 "$OUTPUT_IMG_EDP" 1>/dev/null && echo builtin wallpaper set successfully || echo Warning: not connected to monitor eDP-1, wallpaper will not be set. + rm "$OUTPUT_IMG_EDP.tmp" # Remove the cached image after the new image is created fi - -# Remove tmp cached files if noctalia was able to set the new wallpapers successfully, otherwise keep the tmp files -# errorCheck=$? -# [[ "$errorCheck" -eq 0 ]] && cleanup diff --git a/eDP-1 b/eDP-1 deleted file mode 100644 index e00c951..0000000 Binary files a/eDP-1 and /dev/null differ diff --git a/flat-globe.png b/flat-globe.png deleted file mode 100644 index 913ec1e..0000000 Binary files a/flat-globe.png and /dev/null differ diff --git a/full-res-source/clouds-alpha.jpg b/full-res-source/clouds-alpha.jpg deleted file mode 100644 index 8d38069..0000000 Binary files a/full-res-source/clouds-alpha.jpg and /dev/null differ diff --git a/full-res-source/clouds-alpha.jpg.etag b/full-res-source/clouds-alpha.jpg.etag deleted file mode 100644 index 5087c84..0000000 --- a/full-res-source/clouds-alpha.jpg.etag +++ /dev/null @@ -1 +0,0 @@ -"3754b588a6126e9725838eb1480539d4" diff --git a/full-res-source/clouds-alpha.png b/full-res-source/clouds-alpha.png deleted file mode 100644 index c50daef..0000000 --- a/full-res-source/clouds-alpha.png +++ /dev/null @@ -1,190 +0,0 @@ - - - - Live Cloud Maps - Free, near-realtime cloud maps of the whole Earth - - - - - - - - - - - - - - - -
-
-

Live cloud maps

-

This service provides free, near real-time, high resolution cloud maps of the whole Earth.

-

You can use them for 3D modelling, 2D graphics or any other purpose, without payment.

-

Images are updated every three hours, using EUMETSAT data. - The background of this page shows the latest image. - The top of this page shows the latest image. -

- - - Learn more and get the images - - - Buy Me a Coffee at ko-fi.com -
-
- - \ No newline at end of file diff --git a/full-res-source/earth-night.png b/full-res-source/earth-night.png deleted file mode 100644 index 3ce59dd..0000000 Binary files a/full-res-source/earth-night.png and /dev/null differ diff --git a/full-res-source/earth.png b/full-res-source/earth.png deleted file mode 100644 index 9584289..0000000 Binary files a/full-res-source/earth.png and /dev/null differ diff --git a/full-res-source/earthspec.png b/full-res-source/earthspec.png deleted file mode 100644 index 39e205d..0000000 Binary files a/full-res-source/earthspec.png and /dev/null differ diff --git a/full-res-source/moon.png b/full-res-source/moon.png deleted file mode 100644 index de2f89b..0000000 Binary files a/full-res-source/moon.png and /dev/null differ diff --git a/images/DP-2-render.png b/images/DP-2-render.png deleted file mode 100644 index 951692c..0000000 Binary files a/images/DP-2-render.png and /dev/null differ diff --git a/images/blue-ULTRAWIDE-native.png b/images/blue-ULTRAWIDE-native.png deleted file mode 100644 index 926f6e3..0000000 Binary files a/images/blue-ULTRAWIDE-native.png and /dev/null differ diff --git a/images/clouds-alpha.jpg b/images/clouds-alpha.jpg deleted file mode 100644 index 74bbe5b..0000000 Binary files a/images/clouds-alpha.jpg and /dev/null differ diff --git a/images/clouds-alpha.jpg.etag b/images/clouds-alpha.jpg.etag deleted file mode 100644 index 32ed090..0000000 --- a/images/clouds-alpha.jpg.etag +++ /dev/null @@ -1 +0,0 @@ -"62cff0f01c8d144e941dcdc63a84253d" diff --git a/images/clouds-alpha.jpg.etag.sample b/images/clouds-alpha.jpg.etag.sample deleted file mode 100644 index 5087c84..0000000 --- a/images/clouds-alpha.jpg.etag.sample +++ /dev/null @@ -1 +0,0 @@ -"3754b588a6126e9725838eb1480539d4" diff --git a/images/clouds-alpha.jpg.sample b/images/clouds-alpha.jpg.sample deleted file mode 100644 index 8d38069..0000000 Binary files a/images/clouds-alpha.jpg.sample and /dev/null differ diff --git a/images/eDP-1-render.png b/images/eDP-1-render.png deleted file mode 100644 index ffa7f8a..0000000 Binary files a/images/eDP-1-render.png and /dev/null differ diff --git a/images/moon.tif b/images/moon.tif deleted file mode 100644 index e743063..0000000 Binary files a/images/moon.tif and /dev/null differ diff --git a/images/sample-render.png b/images/sample-render.png deleted file mode 100644 index c3e7e79..0000000 Binary files a/images/sample-render.png and /dev/null differ diff --git a/renders/blue-ULTRAWIDE-native.png b/renders/blue-ULTRAWIDE-native.png deleted file mode 100644 index 50528f7..0000000 Binary files a/renders/blue-ULTRAWIDE-native.png and /dev/null differ diff --git a/renders/blue-ULTRAWIDE.png b/renders/blue-ULTRAWIDE.png deleted file mode 100644 index 14e84c0..0000000 Binary files a/renders/blue-ULTRAWIDE.png and /dev/null differ diff --git a/renders/blue-marble-EDP.png b/renders/blue-marble-EDP.png deleted file mode 100644 index c3e7e79..0000000 Binary files a/renders/blue-marble-EDP.png and /dev/null differ diff --git a/renders/stars.png b/renders/stars.png deleted file mode 100644 index aedda35..0000000 Binary files a/renders/stars.png and /dev/null differ diff --git a/sample-images/NASA-NIGHT-worldmap-2016.jpg b/sample-images/NASA-NIGHT-worldmap-2016.jpg deleted file mode 100644 index eed7cfa..0000000 Binary files a/sample-images/NASA-NIGHT-worldmap-2016.jpg and /dev/null differ diff --git a/sample-images/NASA-worldmap-october.jpg b/sample-images/NASA-worldmap-october.jpg deleted file mode 100644 index b62569e..0000000 Binary files a/sample-images/NASA-worldmap-october.jpg and /dev/null differ diff --git a/sample-images/cloudmap.png b/sample-images/cloudmap.png deleted file mode 100644 index a4e678a..0000000 Binary files a/sample-images/cloudmap.png and /dev/null differ diff --git a/sample-images/day.jpg b/sample-images/day.jpg deleted file mode 100644 index d1b2600..0000000 Binary files a/sample-images/day.jpg and /dev/null differ diff --git a/sample-images/night.jpg b/sample-images/night.jpg deleted file mode 100644 index c30cc94..0000000 Binary files a/sample-images/night.jpg and /dev/null differ diff --git a/sample-images/xplanet_poc.png b/sample-images/xplanet_poc.png deleted file mode 100644 index c0c610b..0000000 Binary files a/sample-images/xplanet_poc.png and /dev/null differ diff --git a/stations b/sattelites/stations similarity index 100% rename from stations rename to sattelites/stations diff --git a/stations.tle b/sattelites/stations.tle similarity index 100% rename from stations.tle rename to sattelites/stations.tle diff --git a/test-render.sh b/test-render.sh deleted file mode 100755 index 76cb7de..0000000 --- a/test-render.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -# A testbed script for experimenting with rendering the live-earth-wallpaper. -# xplanet -num_times 1 -output "test-render.png" -geometry 2560x1600 -config xplanet.conf -origin moon -target earth -# xplanet -num_times 1 -output "test-render.png" -geometry 2560x1600 -config xplanet.conf -projection rectangular -origin moon -target earth -xplanet -num_times 1 -output "test-render.png" -geometry 2560x1600 -config xplanet.conf -projection rectangular -longitude -87.56 -latitude 33.21 - diff --git a/test.png b/test.png deleted file mode 100644 index 65d833c..0000000 Binary files a/test.png and /dev/null differ diff --git a/xplanet.conf b/xplanet.conf index eb2e3b0..13eb43d 100644 --- a/xplanet.conf +++ b/xplanet.conf @@ -2,14 +2,14 @@ [earth] "Earth" color={255,255,255} -map=./full-res-source/earth.png -night_map=./full-res-source/earth-night.png -cloud_map=./full-res-source/clouds-alpha.jpg -specular_map=./full-res-source/earthspec.png +map=images/maps/earth.png +night_map=images/maps/earth-night.png +cloud_map=images/maps/clouds-alpha.jpg +specular_map=images/maps/earthspec.png cloud_gamma=0.7 cloud_threshold=20 twilight=12 # satellite_file=stations [moon] -image=./full-res-source/moon.png +image=images/maps/moon.png magnify=15