assets

@@ -1 +1 @@
-Subproject commit a20bd1dad1eb90a7e8ec8010bdba03fdc2e477bd
+Subproject commit 7f9886acae8ab62827821ba4f5271689f9a67d4d

src/game/ship.rs

@@ -3,7 +3,9 @@ use cgmath::{Deg, Point2, Point3};
 use crate::{
 	content::{self, ship::Engine},
 	physics::PhysicsBody,
-	render::{Sprite, SpriteTexture, Spriteable, SubSprite},
+	render::Sprite,
+	render::SpriteTexture,
+	render::Spriteable,
 };
 
 pub struct Ship {
@@ -33,7 +35,7 @@ impl Spriteable for Ship {
 			Some(
 				self.engines
 					.iter()
-					.map(|e| SubSprite {
+					.map(|e| Sprite {
 						pos: Point3 {
 							x: e.pos.x,
 							y: e.pos.y,
@@ -42,6 +44,7 @@ impl Spriteable for Ship {
 						texture: SpriteTexture("flare::ion".to_owned()),
 						angle: Deg(0.0),
 						size: e.size,
+						children: None,
 					})
 					.collect(),
 			)

src/render/gpustate.rs

@@ -9,7 +9,6 @@ use super::{
 	consts::{OPENGL_TO_WGPU_MATRIX, SPRITE_INSTANCE_LIMIT, STARFIELD_INSTANCE_LIMIT},
 	globaldata::{GlobalData, GlobalDataContent},
 	pipeline::PipelineBuilder,
-	sprite::SubSprite,
 	texturearray::TextureArray,
 	vertexbuffer::{
 		consts::{SPRITE_INDICES, SPRITE_VERTICES},
@@ -286,10 +285,15 @@ impl GPUState {
 		&self,
 		game: &Game,
 		instances: &mut Vec<SpriteInstance>,
-		s: SubSprite,
+		s: Sprite,
 		parent_pos: Point2<f32>,
 		parent_angle: Deg<f32>,
 	) {
+		// TODO: clean up
+		if s.children.is_some() {
+			panic!("Child sprites must not have child sprites!")
+		}
+
 		let texture = self.texture_array.get_sprite_texture(s.texture);
 		let scale = s.size / (s.pos.z * game.camera.zoom);
 		let sprite_aspect_and_scale =

src/render/mod.rs

@@ -7,10 +7,8 @@ mod texturearray;
 mod vertexbuffer;
 
 pub use gpustate::GPUState;
-pub use sprite::{Sprite, Spriteable, SubSprite};
+pub use sprite::{Sprite, Spriteable};
 
 /// A handle to a sprite texture
-/// TODO: This should be easy to copy,
-/// but string references create unnecessary complexity
 #[derive(Debug, Clone)]
 pub struct SpriteTexture(pub String);

src/render/sprite.rs

@@ -3,7 +3,7 @@ use cgmath::{Deg, Point3};
 use super::SpriteTexture;
 
 pub struct Sprite {
-	/// The sprite texture to draw
+	/// Name of the sprite to draw
 	pub texture: SpriteTexture,
 
 	/// This object's position, in world coordinates.
@@ -18,26 +18,13 @@ pub struct Sprite {
 	pub angle: Deg<f32>,
 
 	/// Sprites that should be drawn relative to this sprite.
-	pub children: Option<Vec<SubSprite>>,
+	/// Coordinates of sprites in this array will be interpreted
-}
+	/// as world units, relative to the center of this sprite,
-
+	/// before any rotation or scaling.
-pub struct SubSprite {
+	/// Children rotate with their parent sprite.
-	/// The sprite texture to draw
+	///
-	pub texture: SpriteTexture,
+	/// Note that child sprites may NOT have children.
-
+	pub children: Option<Vec<Sprite>>,
-	/// This object's position, in world coordinates.
-	/// This is relative to this sprite's parent.
-	pub pos: Point3<f32>,
-
-	/// The size of this sprite,
-	/// given as height in world units.
-	pub size: f32,
-
-	/// This sprite's rotation
-	/// (relative to north, measured ccw)
-	/// Just as position, this is relative to this
-	/// subsprite's parent sprite.
-	pub angle: Deg<f32>,
 }
 
 pub trait Spriteable {

src/render/texturearray/array.rs

@@ -45,7 +45,7 @@ impl TextureArray {
 		});
 
 		let bind_group_layout = device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
-			label: Some("TextureArray bind group layout"),
+			label: Some("texture_bind_group_layout"),
 			entries: &[
 				// Texture data
 				wgpu::BindGroupLayoutEntry {
@@ -70,7 +70,7 @@ impl TextureArray {
 
 		let views: Vec<&wgpu::TextureView> = loader.texture_data.iter().map(|x| &x.view).collect();
 		let bind_group = device.create_bind_group(&wgpu::BindGroupDescriptor {
-			label: Some("TextureArray bind group"),
+			label: Some("texture_bind_group"),
 			layout: &bind_group_layout,
 			entries: &[
 				wgpu::BindGroupEntry {