From 327e2b43b335e768a5ef5891dafc45f9bb4ff3de Mon Sep 17 00:00:00 2001 From: Mark Date: Fri, 16 Feb 2024 13:29:01 -0800 Subject: [PATCH] Minor cleanup --- TODO.md | 5 +++++ assets | 2 +- crates/render/src/texturearray.rs | 11 ----------- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/TODO.md b/TODO.md index eaf199a..7b0607d 100644 --- a/TODO.md +++ b/TODO.md @@ -1,8 +1,11 @@ # Specific projects ## Now: +- init on resize - hide ui element - zoom limits +- text scrolling +- scrollbox scroll limits - clean up content - Clean up state api - Clean up & document UI api @@ -12,6 +15,8 @@ - Selection while flying - outfitter - fps textbox positioning +- shield generation curve +- clippy & rules ## Small jobs - Better planet icons in radar diff --git a/assets b/assets index b8ea8c5..bd425cc 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit b8ea8c5a04c0216304a81ebf396b7320a709d6ed +Subproject commit bd425ccb10bb16661620916ff4f1a387b54ce7ca diff --git a/crates/render/src/texturearray.rs b/crates/render/src/texturearray.rs index be6a3a8..1af3c14 100644 --- a/crates/render/src/texturearray.rs +++ b/crates/render/src/texturearray.rs @@ -2,7 +2,6 @@ use crate::globaluniform::{AtlasArray, AtlasImageLocation}; use anyhow::Result; use bytemuck::Zeroable; use galactica_content::Content; -use galactica_packer::SpriteAtlasImage; use galactica_util::constants::ASSET_CACHE; use image::GenericImageView; use log::info; @@ -72,16 +71,6 @@ impl RawTexture { } } -#[derive(Debug, Clone)] -pub struct Texture { - pub index: u32, // Index in texture array - pub len: u32, // Number of frames - pub frame_duration: f32, // Frames per second - pub aspect: f32, // width / height - pub repeat: u32, // How to re-play this texture - pub location: Vec, -} - pub struct TextureArray { pub bind_group: wgpu::BindGroup, pub bind_group_layout: BindGroupLayout,