Some work on colors and images

backends/sdl/src/lib.rs

@@ -3,6 +3,7 @@
 use std::ffi::{c_int, CString};
 
 use common::FastHashSet;
+use graphics::Image;
 pub use sdl2_sys as sys;
 use sdl2_sys::{
   SDL_GLattr::{
@@ -34,7 +35,7 @@ pub struct WindowSettings {
   pub width: u32,
   pub height: u32,
   pub vsync_enabled: bool,
-  pub icon: Option<graphics::Color32Image>,
+  pub icon: Option<Image>,
 }
 
 impl Default for WindowSettings {
@@ -117,7 +118,7 @@ impl Window {
   }
 
   /// Sets the window icon.
-  pub fn set_window_icon(&self, icon: &graphics::Color32Image) {
+  pub fn set_window_icon(&self, icon: &Image) {
     use sdl2_sys::*;
 
     unsafe {

crates/common/src/abstractions/assets.rs

@@ -14,12 +14,6 @@ pub enum AssetError {
 /// Represents an asset that can be loaded and used by the engine
 pub trait Asset {}
 
-/// An entry in the asset manager
-enum AssetEntry {
-  Unloaded,
-  Loaded(Box<dyn Asset>),
-}
-
 /// A manager for assets
 #[derive(Default)]
 pub struct AssetManager {}

crates/common/src/maths.rs

@@ -2,6 +2,7 @@
 
 pub use angles::*;
 pub use cameras::*;
+pub use colors::*;
 pub use curves::*;
 pub use geometry::*;
 pub use hex::*;
@@ -19,6 +20,7 @@ pub use time::*;
 
 mod angles;
 mod cameras;
+mod colors;
 mod curves;
 mod geometry;
 mod hex;

crates/graphics/src/colors.rs → crates/common/src/maths/colors.rs

@@ -6,7 +6,8 @@
 
 use std::ops::{Div, Index, Mul};
 
-use common::{ApproxEq, FromRandom, Lerp, Random, Scalar, ToVirtualPath};
+use super::*;
+use crate::ToVirtualPath;
 
 /// Represents a type of pixel.
 pub trait Pixel: Copy + Default {
@@ -88,10 +89,10 @@ impl PartialEq for Color {
 impl Lerp for Color {
   fn lerp(a: Color, b: Color, t: f32) -> Self {
     Color::rgba(
-      f32::lerp(a.r, b.r, t),
-      f32::lerp(a.g, b.g, t),
-      f32::lerp(a.b, b.b, t),
-      f32::lerp(a.a, b.a, t),
+      <f32 as Lerp>::lerp(a.r, b.r, t),
+      <f32 as Lerp>::lerp(a.g, b.g, t),
+      <f32 as Lerp>::lerp(a.b, b.b, t),
+      <f32 as Lerp>::lerp(a.a, b.a, t),
     )
   }
 }

crates/graphics/src/animations.rs

@@ -1,8 +1,6 @@
 //! Animation support.
 
-use common::{FastHashMap, Lerp, Quat, StringName, TimeSpan, Vec2, Vec3};
-
-use crate::{Color, Color32};
+use common::{Color, Color32, FastHashMap, Lerp, Quat, StringName, TimeSpan, Vec2, Vec3};
 
 /// Represents a type that can be animated by an animation tree.
 pub trait Animatable<V> {

crates/graphics/src/geometry.rs

@@ -1,6 +1,6 @@
 //! Geometry batching for common shapes and polygon rendering.
 
-use common::{vec2, Rectangle, Vec2};
+use common::{vec2, Color32, Rectangle, Vec2};
 
 use super::*;
 

crates/graphics/src/headless.rs

@@ -2,7 +2,7 @@
 
 use std::sync::atomic::{AtomicU32, Ordering};
 
-use common::{Rectangle, UVec2};
+use common::{Color, Rectangle, UVec2};
 
 use super::*;