new built-in sky shader

Author: galister

dash-frontend/assets/dashboard/builtin-skybox-preview.jpg

@@ -117,8 +117,7 @@ impl ViewTrait for View {
 						.get_destination_path(resolution)
 						.context("Skymap not found" /* you shouldn't really see this, like ever. */)?;
 
-					par.general_config.skybox_texture = config_io::get_skymaps_root()
-						.join(skymap_file_path)
+					par.general_config.skybox_texture = skymap_file_path
 						.to_str()
 						.context("Skymap filename not valid UTF-8")?
 						.into();

dash-frontend/src/views/remote_skymap_downloader.rs

@@ -215,7 +215,7 @@ impl View {
 				view: views::skymap_list_cell::View::new(views::skymap_list_cell::Params {
 					id_parent: id_list,
 					layout,
-					entry: entry.clone(),
+					entry: Some(entry.clone()),
 					on_click: self
 						.tasks
 						.get_button_click_callback(Task::ShowRemoteSkymapDownloader(skymap_uuid)),

dash-frontend/src/views/remote_skymap_list.rs

@@ -16,7 +16,6 @@ use crate::{
 	util::{
 		networking::skymap_catalog::{self, SkymapCatalogEntry, SkymapResolution},
 		popup_manager::{MountPopupOnceParams, PopupHolder},
-		wgui_simple,
 	},
 	views::{self, ViewTrait, ViewUpdateParams},
 };
@@ -27,6 +26,7 @@ enum Task {
 	Refresh,
 	ShowSkymapResolutionSelector(SkymapCatalogEntry),
 	SetSkymap(SkymapCatalogEntry, SkymapResolution),
+	SetSkymapBuiltIn,
 }
 
 pub struct Params<'a> {
@@ -77,6 +77,10 @@ impl ViewTrait for View {
 					Task::SetSkymap(entry, resolution) => {
 						self.set_skymap(entry, resolution, par.general_config, par.config_change_kind)?;
 					}
+					Task::SetSkymapBuiltIn => {
+						par.general_config.skybox_texture = "".into();
+						*par.config_change_kind = Some(ConfigChangeKind::EnvironmentBlend);
+					}
 				}
 			}
 		}
@@ -205,22 +209,27 @@ impl View {
 		layout.remove_children(self.list_parent);
 		self.cells.clear();
 
-		if entries.is_empty() {
-			wgui_simple::create_label(
-				layout,
-				self.list_parent,
-				Translation::from_translation_key("APP_SETTINGS.NO_SKYMAPS_FOUND"),
-			)?;
-			return Ok(());
+		let skymaps_root = config_io::get_skymaps_root();
+
+		let mut view = views::skymap_list_cell::View::new(views::skymap_list_cell::Params {
+			id_parent: self.list_parent,
+			layout,
+			entry: None,
+			on_click: self.tasks.get_button_click_callback(Task::SetSkymapBuiltIn),
+		})?;
+		// load preview image
+		let data = include_bytes!("../../assets/dashboard/builtin-skybox-preview.jpg");
+		if let Ok(glyph_data) = CustomGlyphData::from_bytes_raster(&self.globals, "builtin-skybox-preview.jpg", data) {
+			view.set_image(layout, Some(glyph_data))?;
 		}
 
-		let skymaps_root = config_io::get_skymaps_root();
+		self.cells.push(Cell { view });
 
 		for entry in &entries {
 			let mut view = views::skymap_list_cell::View::new(views::skymap_list_cell::Params {
 				id_parent: self.list_parent,
 				layout,
-				entry: entry.clone(),
+				entry: Some(entry.clone()),
 				on_click: self
 					.tasks
 					.get_button_click_callback(Task::ShowSkymapResolutionSelector(entry.clone())),

dash-frontend/src/views/skymap_list.rs

@@ -23,7 +23,7 @@ use crate::util::{
 pub struct Params<'a> {
 	pub id_parent: WidgetID,
 	pub layout: &'a mut Layout,
-	pub entry: networking::skymap_catalog::SkymapCatalogEntry,
+	pub entry: Option<networking::skymap_catalog::SkymapCatalogEntry>,
 	pub on_click: ButtonClickCallback,
 }
 
@@ -108,11 +108,20 @@ impl View {
 
 			label_title.set_text_simple(
 				&mut globals.get(),
-				Translation::from_raw_text_string(par.entry.name.clone()),
+				Translation::from_raw_text_string(
+					par
+						.entry
+						.as_ref()
+						.map(|e| e.name.clone())
+						.unwrap_or_else(|| "Built-in Sky Shader".into()),
+				),
 			);
 			label_author.set_text_simple(
 				&mut globals.get(),
-				Translation::from_raw_text_string(format!("by {}", par.entry.author)),
+				Translation::from_raw_text_string(format!(
+					"by {}",
+					par.entry.as_ref().map(|e| e.author.as_str()).unwrap_or("WayVR Team")
+				)),
 			);
 		}
 
@@ -123,7 +132,9 @@ impl View {
 		})?;
 
 		// Populate resolution pips
-		populate_res_pips(par.layout, id_resolution_pips, &mut parser_state, &par.entry)?;
+		if let Some(entry) = par.entry.as_ref() {
+			populate_res_pips(par.layout, id_resolution_pips, &mut parser_state, entry)?;
+		}
 
 		Ok(Self {
 			parser_state,