Minor cleanup

master
Mark 2024-02-16 13:29:01 -08:00
parent 5528f6ed4e
commit 327e2b43b3
Signed by: Mark
GPG Key ID: C6D63995FE72FD80
3 changed files with 6 additions and 12 deletions

View File

@ -1,8 +1,11 @@
# Specific projects # Specific projects
## Now: ## Now:
- init on resize
- hide ui element - hide ui element
- zoom limits - zoom limits
- text scrolling
- scrollbox scroll limits
- clean up content - clean up content
- Clean up state api - Clean up state api
- Clean up & document UI api - Clean up & document UI api
@ -12,6 +15,8 @@
- Selection while flying - Selection while flying
- outfitter - outfitter
- fps textbox positioning - fps textbox positioning
- shield generation curve
- clippy & rules
## Small jobs ## Small jobs
- Better planet icons in radar - Better planet icons in radar

2
assets

@ -1 +1 @@
Subproject commit b8ea8c5a04c0216304a81ebf396b7320a709d6ed Subproject commit bd425ccb10bb16661620916ff4f1a387b54ce7ca

View File

@ -2,7 +2,6 @@ use crate::globaluniform::{AtlasArray, AtlasImageLocation};
use anyhow::Result; use anyhow::Result;
use bytemuck::Zeroable; use bytemuck::Zeroable;
use galactica_content::Content; use galactica_content::Content;
use galactica_packer::SpriteAtlasImage;
use galactica_util::constants::ASSET_CACHE; use galactica_util::constants::ASSET_CACHE;
use image::GenericImageView; use image::GenericImageView;
use log::info; 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<SpriteAtlasImage>,
}
pub struct TextureArray { pub struct TextureArray {
pub bind_group: wgpu::BindGroup, pub bind_group: wgpu::BindGroup,
pub bind_group_layout: BindGroupLayout, pub bind_group_layout: BindGroupLayout,