From d4bd7e82bdd6ff057e3270179e8cfb3ddb178129 Mon Sep 17 00:00:00 2001
From: Mark <mark@betalupi.com>
Date: Sun, 4 Feb 2024 22:43:02 -0800
Subject: [PATCH] Minor cleanup

---
 crates/render/src/ui/api/config.rs            | 28 -------------------
 .../src/ui/{util => elements}/fpsindicator.rs |  0
 .../render/src/ui/{util => elements}/mod.rs   |  0
 .../src/ui/{util => elements}/radialbar.rs    |  0
 .../src/ui/{util => elements}/sprite.rs       |  0
 .../src/ui/{util => elements}/textbox.rs      |  0
 crates/render/src/ui/executor.rs              |  2 +-
 crates/render/src/ui/mod.rs                   |  2 +-
 crates/render/src/ui/state.rs                 |  2 +-
 9 files changed, 3 insertions(+), 31 deletions(-)
 delete mode 100644 crates/render/src/ui/api/config.rs
 rename crates/render/src/ui/{util => elements}/fpsindicator.rs (100%)
 rename crates/render/src/ui/{util => elements}/mod.rs (100%)
 rename crates/render/src/ui/{util => elements}/radialbar.rs (100%)
 rename crates/render/src/ui/{util => elements}/sprite.rs (100%)
 rename crates/render/src/ui/{util => elements}/textbox.rs (100%)

diff --git a/crates/render/src/ui/api/config.rs b/crates/render/src/ui/api/config.rs
deleted file mode 100644
index 786c173..0000000
--- a/crates/render/src/ui/api/config.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-use rhai::{CustomType, TypeBuilder};
-
-#[derive(Debug, Clone)]
-pub struct SceneConfig {
-	pub show_phys: bool,
-	pub show_starfield: bool,
-}
-
-impl SceneConfig {
-	pub fn new() -> Self {
-		Self {
-			show_phys: false,
-			show_starfield: false,
-		}
-	}
-}
-
-impl CustomType for SceneConfig {
-	fn build(mut builder: TypeBuilder<Self>) {
-		builder
-			.with_name("SceneConfig")
-			.with_fn("SceneConfig", Self::new)
-			.with_fn("show_phys", |s: &mut Self, x: bool| s.show_phys = x)
-			.with_fn("show_starfield", |s: &mut Self, x: bool| {
-				s.show_starfield = x
-			});
-	}
-}
diff --git a/crates/render/src/ui/util/fpsindicator.rs b/crates/render/src/ui/elements/fpsindicator.rs
similarity index 100%
rename from crates/render/src/ui/util/fpsindicator.rs
rename to crates/render/src/ui/elements/fpsindicator.rs
diff --git a/crates/render/src/ui/util/mod.rs b/crates/render/src/ui/elements/mod.rs
similarity index 100%
rename from crates/render/src/ui/util/mod.rs
rename to crates/render/src/ui/elements/mod.rs
diff --git a/crates/render/src/ui/util/radialbar.rs b/crates/render/src/ui/elements/radialbar.rs
similarity index 100%
rename from crates/render/src/ui/util/radialbar.rs
rename to crates/render/src/ui/elements/radialbar.rs
diff --git a/crates/render/src/ui/util/sprite.rs b/crates/render/src/ui/elements/sprite.rs
similarity index 100%
rename from crates/render/src/ui/util/sprite.rs
rename to crates/render/src/ui/elements/sprite.rs
diff --git a/crates/render/src/ui/util/textbox.rs b/crates/render/src/ui/elements/textbox.rs
similarity index 100%
rename from crates/render/src/ui/util/textbox.rs
rename to crates/render/src/ui/elements/textbox.rs
diff --git a/crates/render/src/ui/executor.rs b/crates/render/src/ui/executor.rs
index 5d87336..317a02d 100644
--- a/crates/render/src/ui/executor.rs
+++ b/crates/render/src/ui/executor.rs
@@ -12,8 +12,8 @@ use std::{cell::RefCell, num::NonZeroU32, rc::Rc, sync::Arc};
 
 use super::{
 	api::{self, Color, MouseClickEvent, MouseHoverEvent, PlayerShipStateEvent, Rect},
+	elements::{RadialBar, Sprite, TextBox},
 	event::Event,
-	util::{RadialBar, Sprite, TextBox},
 	UiConfig, UiElement, UiState,
 };
 use crate::{ui::api::State, RenderInput, RenderState};
diff --git a/crates/render/src/ui/mod.rs b/crates/render/src/ui/mod.rs
index 34d07ae..4f1d42f 100644
--- a/crates/render/src/ui/mod.rs
+++ b/crates/render/src/ui/mod.rs
@@ -3,7 +3,7 @@ mod event;
 mod executor;
 mod state;
 
-mod util;
+mod elements;
 
 pub(crate) use executor::UiScriptExecutor;
 pub(crate) use state::*;
diff --git a/crates/render/src/ui/state.rs b/crates/render/src/ui/state.rs
index 9ad7265..32c1a04 100644
--- a/crates/render/src/ui/state.rs
+++ b/crates/render/src/ui/state.rs
@@ -6,7 +6,7 @@ use std::collections::HashMap;
 use std::sync::Arc;
 use winit::window::Window;
 
-use super::util::{FpsIndicator, RadialBar, Sprite, TextBox};
+use super::elements::{FpsIndicator, RadialBar, Sprite, TextBox};
 use crate::{RenderInput, RenderState};
 
 #[derive(Debug)]