diff options
| author | HampusM <hampus@hampusmat.com> | 2026-03-25 20:09:13 +0100 |
|---|---|---|
| committer | HampusM <hampus@hampusmat.com> | 2026-03-25 20:09:13 +0100 |
| commit | de74c71eb6d6a67e8c7ac006a1e906175ca32a72 (patch) | |
| tree | 72671f280ff791312679963779d1d6b7cbc4145b /engine/src/image.rs | |
| parent | cee8b3a19833e1143d0551e8031aa812f7c5a92b (diff) | |
refactor(engine): store textures as assets instead of images
Diffstat (limited to 'engine/src/image.rs')
| -rw-r--r-- | engine/src/image.rs | 44 |
1 files changed, 1 insertions, 43 deletions
diff --git a/engine/src/image.rs b/engine/src/image.rs index 9296167..7c18bf7 100644 --- a/engine/src/image.rs +++ b/engine/src/image.rs @@ -4,12 +4,10 @@ use std::path::Path; use image_rs::GenericImageView as _; -use crate::asset::{Assets, Submitter as AssetSubmitter}; -use crate::builder; use crate::color::Color; use crate::data_types::dimens::Dimens; -#[derive(Debug)] +#[derive(Debug, Clone)] pub struct Image { inner: image_rs::DynamicImage, @@ -68,30 +66,6 @@ impl Image } } -builder! { -#[builder(name = SettingsBuilder, derives=(Debug, Clone))] -#[derive(Debug, Default, Clone)] -#[non_exhaustive] -pub struct Settings { -} -} - -impl Settings -{ - pub fn builder() -> SettingsBuilder - { - SettingsBuilder::default() - } -} - -impl Default for SettingsBuilder -{ - fn default() -> Self - { - Settings::default().into() - } -} - /// An enumeration over supported color types and bit depths #[derive(Copy, PartialEq, Eq, Debug, Clone, Hash)] #[non_exhaustive] @@ -150,11 +124,6 @@ impl From<image_rs::ColorType> for ColorType } } -pub fn set_asset_importers(assets: &mut Assets) -{ - assets.set_importer::<_, _>(["png", "jpg"], import_asset); -} - #[derive(Debug, thiserror::Error)] pub enum Error { @@ -171,14 +140,3 @@ pub enum Error #[derive(Debug, thiserror::Error)] #[error(transparent)] pub struct DecodeError(image_rs::ImageError); - -fn import_asset( - asset_submitter: &mut AssetSubmitter<'_>, - path: &Path, - _settings: Option<&'_ Settings>, -) -> Result<(), Error> -{ - asset_submitter.submit_store::<Image>(Image::open(path)?); - - Ok(()) -} |
