Cargo.lock

@@ -580,11 +580,11 @@ dependencies = [
  "anyhow",
  "cgmath",
  "crossbeam",
- "galactica-behavior",
  "galactica-constants",
  "galactica-content",
  "galactica-gameobject",
  "galactica-render",
+ "galactica-shipbehavior",
  "galactica-ui",
  "galactica-world",
  "image",
@@ -597,15 +597,6 @@ dependencies = [
  "winit",
 ]
 
-[[package]]
-name = "galactica-behavior"
-version = "0.0.0"
-dependencies = [
- "cgmath",
- "galactica-content",
- "galactica-world",
-]
-
 [[package]]
 name = "galactica-constants"
 version = "0.0.0"
@@ -651,6 +642,15 @@ dependencies = [
  "winit",
 ]
 
+[[package]]
+name = "galactica-shipbehavior"
+version = "0.0.0"
+dependencies = [
+ "cgmath",
+ "galactica-content",
+ "galactica-world",
+]
+
 [[package]]
 name = "galactica-ui"
 version = "0.0.0"

Cargo.toml

@@ -33,7 +33,7 @@ members = [
 	"crates/render",
 	"crates/constants",
 	"crates/world",
-	"crates/behavior",
+	"crates/shipbehavior",
 	"crates/gameobject",
 	"crates/ui",
 ]
@@ -45,7 +45,7 @@ galactica-content = { path = "crates/content" }
 galactica-render = { path = "crates/render" }
 galactica-constants = { path = "crates/constants" }
 galactica-world = { path = "crates/world" }
-galactica-behavior = { path = "crates/behavior" }
+galactica-shipbehavior = { path = "crates/shipbehavior" }
 galactica-gameobject = { path = "crates/gameobject" }
 galactica-ui = { path = "crates/ui" }
 

TODO.md

@@ -1,9 +1,8 @@
 ## Specific Jobs
- - Finish particles
- - Projectile colliders & particles
  - UI: health, shield, fuel, heat, energy bars
  - UI: text arranger
  - Sound system
+ - Particles, impact effects
  - Debris on ship death
 
 ----------------------------------

assets

@@ -1 +1 @@
-Subproject commit 6e4b7022a963a3357ba5f578bdd91064ae9f6b3e
+Subproject commit b53acd48a98987914ceb196af18ba679a222fa10

content/textures.toml

@@ -33,6 +33,3 @@ path = "ui/radarframe.png"
 
 [texture."ui::centerarrow"]
 path = "ui/center-arrow.png"
-
-[texture."particle::blaster"]
-path = "particle/blaster-01.png"

crates/constants/src/lib.rs

@@ -50,8 +50,5 @@ pub const OBJECT_SPRITE_INSTANCE_LIMIT: u64 = 500;
 /// We can draw at most this many ui sprites on the screen.
 pub const UI_SPRITE_INSTANCE_LIMIT: u64 = 100;
 
-/// The size of our circular particle buffer. When we create particles, the oldest ones are replaced.
-pub const PARTICLE_SPRITE_INSTANCE_LIMIT: u64 = 1000;
-
 /// Must be small enough to fit in an i32
 pub const STARFIELD_SPRITE_INSTANCE_LIMIT: u64 = STARFIELD_COUNT * 24;

crates/content/src/part/texture.rs

@@ -56,6 +56,7 @@ impl crate::Build for Texture {
 				index: ct.textures.len(),
 				aspect: dim.0 as f32 / dim.1 as f32,
 			};
+			ct.texture_index.insert(texture_name.clone(), h);
 
 			if texture_name == ct.starfield_texture_name {
 				if ct.starfield_handle.is_none() {
@@ -66,10 +67,9 @@ impl crate::Build for Texture {
 				}
 			}
 
-			ct.texture_index.insert(texture_name.clone(), h);
 			ct.textures.push(Self {
 				name: texture_name,
-				path,
+				path: path,
 				handle: h,
 			});
 		}

crates/render/shaders/object.wgsl

@@ -3,7 +3,7 @@ struct InstanceInput {
 	@location(3) transform_matrix_1: vec4<f32>,
 	@location(4) transform_matrix_2: vec4<f32>,
 	@location(5) transform_matrix_3: vec4<f32>,
-	@location(6) texture_index: u32,
+	@location(6) texture_idx: u32,
 };
 
 struct VertexInput {
@@ -14,7 +14,7 @@ struct VertexInput {
 struct VertexOutput {
 	@builtin(position) position: vec4<f32>,
 	@location(0) texture_coords: vec2<f32>,
-	@location(1) texture_index: u32,
+	@location(1) index: u32,
 }
 
 
@@ -29,7 +29,6 @@ struct GlobalUniform {
 	starfield_texture: vec2<u32>,
 	starfield_tile_size: vec2<f32>,
 	starfield_size_limits: vec2<f32>,
-	current_time: vec2<f32>,
 };
 
 
@@ -57,7 +56,7 @@ fn vertex_main(
 	var out: VertexOutput;
 	out.position = transform * vec4<f32>(vertex.position, 1.0);
 	out.texture_coords = vertex.texture_coords;
-	out.texture_index = instance.texture_index;
+	out.index = instance.texture_idx;
 	return out;
 }
 
@@ -65,7 +64,7 @@ fn vertex_main(
 @fragment
 fn fragment_main(in: VertexOutput) -> @location(0) vec4<f32> {
 	return textureSampleLevel(
-		texture_array[in.texture_index],
+		texture_array[in.index],
 		sampler_array[0],
 		in.texture_coords,
 		0.0

crates/render/shaders/particle.wgsl

@@ -1,85 +0,0 @@
-struct InstanceInput {
-	@location(2) position: vec3<f32>,
-	@location(3) size: f32,
-	@location(4) expires: f32,
-	@location(5) texture_index: u32,
-};
-
-struct VertexInput {
-	@location(0) position: vec3<f32>,
-	@location(1) texture_coords: vec2<f32>,
-}
-
-struct VertexOutput {
-	@builtin(position) position: vec4<f32>,
-	@location(0) texture_coords: vec2<f32>,
-	@location(1) texture_index: u32,
-}
-
-
-@group(1) @binding(0)
-var<uniform> global: GlobalUniform;
-struct GlobalUniform {
-	camera_position: vec2<f32>,
-	camera_zoom: vec2<f32>,
-	camera_zoom_limits: vec2<f32>,
-	window_size: vec2<f32>,
-	window_aspect: vec2<f32>,
-	starfield_texture: vec2<u32>,
-	starfield_tile_size: vec2<f32>,
-	starfield_size_limits: vec2<f32>,
-	current_time: vec2<f32>,
-};
-
-
-@group(0) @binding(0)
-var texture_array: binding_array<texture_2d<f32>>;
-@group(0) @binding(1)
-var sampler_array: binding_array<sampler>;
-
-
-
-
-@vertex
-fn vertex_main(
-	vertex: VertexInput,
-	instance: InstanceInput,
-) -> VertexOutput {
-
-	var out: VertexOutput;
-	out.texture_coords = vertex.texture_coords;
-	out.texture_index = instance.texture_index;
-
-	if instance.expires < global.current_time.x {
-		out.position = vec4<f32>(2.0, 2.0, 0.0, 1.0);
-		return out;
-	}
-
-	var scale: f32 = instance.size / global.camera_zoom.x;
-	var pos: vec2<f32> = vec2(vertex.position.x, vertex.position.y);
-
-	pos = pos * vec2<f32>(
-		1.0 * scale / global.window_aspect.x,
-		scale
-	);
-
-	var ipos: vec2<f32> = vec2(instance.position.x, instance.position.y) - global.camera_position;
-	pos = pos + vec2<f32>(
-		ipos.x / (global.camera_zoom.x/2.0) / global.window_aspect.x,
-		ipos.y / (global.camera_zoom.x/2.0)
-	);
-
-	out.position = vec4<f32>(pos, 0.0, 1.0) * instance.position.z;
-	return out;
-}
-
-
-@fragment
-fn fragment_main(in: VertexOutput) -> @location(0) vec4<f32> {
-	return textureSampleLevel(
-		texture_array[in.texture_index],
-		sampler_array[0],
-		in.texture_coords,
-		0.0
-	).rgba;
-}

crates/render/shaders/starfield.wgsl

@@ -26,7 +26,6 @@ struct GlobalUniform {
 	starfield_texture: vec2<u32>,
 	starfield_tile_size: vec2<f32>,
 	starfield_size_limits: vec2<f32>,
-	current_time: vec2<f32>,
 };
 
 

crates/render/shaders/ui.wgsl

@@ -4,7 +4,7 @@ struct InstanceInput {
 	@location(4) transform_matrix_2: vec4<f32>,
 	@location(5) transform_matrix_3: vec4<f32>,
 	@location(6) color_transform: vec4<f32>,
-	@location(7) texture_index: u32,
+	@location(7) texture_idx: u32,
 };
 
 struct VertexInput {
@@ -15,7 +15,7 @@ struct VertexInput {
 struct VertexOutput {
 	@builtin(position) position: vec4<f32>,
 	@location(0) texture_coords: vec2<f32>,
-	@location(1) texture_index: u32,
+	@location(1) index: u32,
 	@location(2) color_transform: vec4<f32>,
 }
 
@@ -31,7 +31,6 @@ struct GlobalUniform {
 	starfield_texture: vec2<u32>,
 	starfield_tile_size: vec2<f32>,
 	starfield_size_limits: vec2<f32>,
-	current_time: vec2<f32>,
 };
 
 
@@ -59,7 +58,7 @@ fn vertex_main(
 	var out: VertexOutput;
 	out.position = transform * vec4<f32>(vertex.position, 1.0);
 	out.texture_coords = vertex.texture_coords;
-	out.texture_index = instance.texture_index;
+	out.index = instance.texture_idx;
 	out.color_transform = instance.color_transform;
 	return out;
 }
@@ -68,7 +67,7 @@ fn vertex_main(
 @fragment
 fn fragment_main(in: VertexOutput) -> @location(0) vec4<f32> {
 	return textureSampleLevel(
-		texture_array[in.texture_index],
+		texture_array[in.index],
 		sampler_array[0],
 		in.texture_coords,
 		0.0

crates/render/src/globaldata.rs

@@ -30,7 +30,7 @@ pub struct GlobalDataContent {
 	/// Size ratio of window, in physical pixels
 	pub window_size: [f32; 2],
 
-	/// Aspect ratio of window
+	// Aspect ration of window
 	/// Second component is ignored.
 	pub window_aspect: [f32; 2],
 
@@ -42,12 +42,8 @@ pub struct GlobalDataContent {
 	/// Second component is ignored.
 	pub starfield_tile_size: [f32; 2],
 
-	/// Min and max starfield star size, in game units
+	// Min and max starfield star size, in game units
 	pub starfield_size_limits: [f32; 2],
-
-	/// Current game time, in seconds.
-	/// Second component is ignored.
-	pub current_time: [f32; 2],
 }
 
 impl GlobalDataContent {
@@ -74,7 +70,7 @@ impl GlobalData {
 				},
 				count: None,
 			}],
-			label: Some("globaldata bind group layout"),
+			label: Some("camera_bind_group_layout"),
 		});
 
 		let bind_group = device.create_bind_group(&wgpu::BindGroupDescriptor {
@@ -83,7 +79,7 @@ impl GlobalData {
 				binding: 0,
 				resource: buffer.as_entire_binding(),
 			}],
-			label: Some("globaldata bind group"),
+			label: Some("camera_bind_group"),
 		});
 
 		return Self {

crates/render/src/gpustate.rs

@@ -2,7 +2,7 @@ use anyhow::Result;
 use bytemuck;
 use cgmath::{Deg, EuclideanSpace, Matrix4, Point2, Vector3};
 use galactica_constants;
-use std::{iter, rc::Rc, time::Instant};
+use std::{iter, rc::Rc};
 use wgpu;
 use winit::{self, dpi::LogicalSize, window::Window};
 
@@ -10,13 +10,13 @@ use crate::{
 	content,
 	globaldata::{GlobalData, GlobalDataContent},
 	pipeline::PipelineBuilder,
-	sprite::{ObjectSubSprite, ParticleBuilder},
+	sprite::ObjectSubSprite,
 	starfield::Starfield,
 	texturearray::TextureArray,
 	vertexbuffer::{
 		consts::{SPRITE_INDICES, SPRITE_VERTICES},
-		types::{ObjectInstance, ParticleInstance, StarfieldInstance, TexturedVertex, UiInstance},
-		BufferObject, VertexBuffer,
+		types::{ObjectInstance, StarfieldInstance, TexturedVertex, UiInstance},
+		VertexBuffer,
 	},
 	ObjectSprite, UiSprite, OPENGL_TO_WGPU_MATRIX,
 };
@@ -39,7 +39,6 @@ pub struct GPUState {
 
 	object_pipeline: wgpu::RenderPipeline,
 	starfield_pipeline: wgpu::RenderPipeline,
-	particle_pipeline: wgpu::RenderPipeline,
 	ui_pipeline: wgpu::RenderPipeline,
 
 	starfield: Starfield,
@@ -52,12 +51,6 @@ struct VertexBuffers {
 	object: Rc<VertexBuffer>,
 	starfield: Rc<VertexBuffer>,
 	ui: Rc<VertexBuffer>,
-
-	/// The index of the next particle slot we'll write to.
-	/// This must cycle to 0 whenever it exceeds the size
-	/// of the particle instance array.
-	particle_array_head: u64,
-	particle: Rc<VertexBuffer>,
 }
 
 impl GPUState {
@@ -127,7 +120,7 @@ impl GPUState {
 
 		let vertex_buffers = VertexBuffers {
 			object: Rc::new(VertexBuffer::new::<TexturedVertex, ObjectInstance>(
-				"object",
+				"objecte",
 				&device,
 				Some(SPRITE_VERTICES),
 				Some(SPRITE_INDICES),
@@ -149,15 +142,6 @@ impl GPUState {
 				Some(SPRITE_INDICES),
 				galactica_constants::UI_SPRITE_INSTANCE_LIMIT,
 			)),
-
-			particle_array_head: 0,
-			particle: Rc::new(VertexBuffer::new::<TexturedVertex, ParticleInstance>(
-				"particle",
-				&device,
-				Some(SPRITE_VERTICES),
-				Some(SPRITE_INDICES),
-				galactica_constants::PARTICLE_SPRITE_INSTANCE_LIMIT,
-			)),
 		};
 
 		// Load uniforms
@@ -207,18 +191,6 @@ impl GPUState {
 			.set_bind_group_layouts(bind_group_layouts)
 			.build();
 
-		let particle_pipeline = PipelineBuilder::new("particle", &device)
-			.set_shader(include_str!(concat!(
-				env!("CARGO_MANIFEST_DIR"),
-				"/shaders/",
-				"particle.wgsl"
-			)))
-			.set_format(config.format)
-			.set_triangle(true)
-			.set_vertex_buffer(&vertex_buffers.particle)
-			.set_bind_group_layouts(bind_group_layouts)
-			.build();
-
 		let mut starfield = Starfield::new();
 		starfield.regenerate();
 
@@ -235,7 +207,6 @@ impl GPUState {
 			object_pipeline,
 			starfield_pipeline,
 			ui_pipeline,
-			particle_pipeline,
 
 			starfield,
 			texture_array,
@@ -529,12 +500,8 @@ impl GPUState {
 		&mut self,
 		camera_pos: Point2<f32>,
 		camera_zoom: f32,
-
-		// TODO: clean this up, pass one struct
 		object_sprites: &Vec<ObjectSprite>,
 		ui_sprites: &Vec<UiSprite>,
-		new_particles: &mut Vec<ParticleBuilder>,
-		start_instant: Instant,
 	) -> Result<(), wgpu::SurfaceError> {
 		let output = self.surface.get_current_texture()?;
 		let view = output
@@ -568,9 +535,6 @@ impl GPUState {
 			timestamp_writes: None,
 		});
 
-		// TODO: handle overflow
-		let time_now = start_instant.elapsed().as_secs_f32();
-
 		// Update global values
 		self.queue.write_buffer(
 			&self.global_data.buffer,
@@ -590,31 +554,9 @@ impl GPUState {
 					galactica_constants::STARFIELD_SIZE_MIN,
 					galactica_constants::STARFIELD_SIZE_MAX,
 				],
-				current_time: [time_now, 0.0],
 			}]),
 		);
 
-		for i in new_particles.iter() {
-			let texture = self.texture_array.get_texture(i.texture);
-			self.queue.write_buffer(
-				&self.vertex_buffers.particle.instances,
-				ParticleInstance::SIZE * self.vertex_buffers.particle_array_head,
-				bytemuck::cast_slice(&[ParticleInstance {
-					position: [i.pos.x, i.pos.y, 1.0],
-					size: i.size,
-					texture_index: texture.index,
-					expires: time_now + i.lifetime,
-				}]),
-			);
-			self.vertex_buffers.particle_array_head += 1;
-			if self.vertex_buffers.particle_array_head
-				== galactica_constants::PARTICLE_SPRITE_INSTANCE_LIMIT
-			{
-				self.vertex_buffers.particle_array_head = 0;
-			}
-		}
-		new_particles.clear();
-
 		// Create sprite instances
 		let (n_object, n_ui) =
 			self.update_sprite_instances(camera_zoom, camera_pos, object_sprites, ui_sprites);
@@ -638,15 +580,6 @@ impl GPUState {
 		render_pass.set_pipeline(&self.object_pipeline);
 		render_pass.draw_indexed(0..SPRITE_INDICES.len() as u32, 0, 0..n_object as _);
 
-		// Particle pipeline
-		self.vertex_buffers.particle.set_in_pass(&mut render_pass);
-		render_pass.set_pipeline(&self.particle_pipeline);
-		render_pass.draw_indexed(
-			0..SPRITE_INDICES.len() as u32,
-			0,
-			0..galactica_constants::PARTICLE_SPRITE_INSTANCE_LIMIT as _,
-		);
-
 		// Ui pipeline
 		self.vertex_buffers.ui.set_in_pass(&mut render_pass);
 		render_pass.set_pipeline(&self.ui_pipeline);

crates/render/src/lib.rs

@@ -17,7 +17,7 @@ mod vertexbuffer;
 
 use galactica_content as content;
 pub use gpustate::GPUState;
-pub use sprite::{AnchoredUiPosition, ObjectSprite, ObjectSubSprite, ParticleBuilder, UiSprite};
+pub use sprite::{AnchoredUiPosition, ObjectSprite, ObjectSubSprite, UiSprite};
 
 use cgmath::Matrix4;
 

crates/render/src/sprite.rs

@@ -1,23 +1,6 @@
 use crate::content;
 use cgmath::{Deg, Point2, Point3};
 
-/// Instructions to create a new particle
-pub struct ParticleBuilder {
-	/// The texture to use for this particle
-	pub texture: content::TextureHandle,
-
-	// TODO: rotation, velocity
-	/// This object's center, in world coordinates.
-	pub pos: Point3<f32>,
-
-	/// This particle's lifetime, in seconds
-	pub lifetime: f32,
-
-	/// The size of this sprite,
-	/// given as height in world units.
-	pub size: f32,
-}
-
 /// The location of a UI element, in one of a few
 /// possible coordinate systems.
 ///

crates/render/src/vertexbuffer/types.rs

@@ -195,60 +195,3 @@ impl BufferObject for UiInstance {
 		}
 	}
 }
-
-#[repr(C)]
-#[derive(Copy, Clone, bytemuck::Pod, bytemuck::Zeroable)]
-pub struct ParticleInstance {
-	/// World position of this particle
-	pub position: [f32; 3],
-
-	// TODO: docs: particle frames must all have the same size
-	// TODO: is transparency trimmed? That's not ideal for animated particles!
-	/// The height of this particle, in world units
-	pub size: f32,
-
-	// TODO: rotation, velocity vector
-	// TODO: animated sprites
-	// TODO: texture aspect ratio
-	/// The time, in seconds, at which this particle expires.
-	/// Time is kept by a variable in the global uniform.
-	pub expires: f32,
-
-	/// What texture to use for this particle
-	pub texture_index: u32,
-}
-
-impl BufferObject for ParticleInstance {
-	fn layout() -> wgpu::VertexBufferLayout<'static> {
-		wgpu::VertexBufferLayout {
-			array_stride: Self::SIZE,
-			step_mode: wgpu::VertexStepMode::Instance,
-			attributes: &[
-				// Position
-				wgpu::VertexAttribute {
-					offset: 0,
-					shader_location: 2,
-					format: wgpu::VertexFormat::Float32x3,
-				},
-				// Size
-				wgpu::VertexAttribute {
-					offset: mem::size_of::<[f32; 3]>() as wgpu::BufferAddress,
-					shader_location: 3,
-					format: wgpu::VertexFormat::Float32,
-				},
-				// Expires
-				wgpu::VertexAttribute {
-					offset: mem::size_of::<[f32; 4]>() as wgpu::BufferAddress,
-					shader_location: 4,
-					format: wgpu::VertexFormat::Float32,
-				},
-				// Texture
-				wgpu::VertexAttribute {
-					offset: mem::size_of::<[f32; 5]>() as wgpu::BufferAddress,
-					shader_location: 5,
-					format: wgpu::VertexFormat::Uint32,
-				},
-			],
-		}
-	}
-}

crates/shipbehavior/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "galactica-behavior"
+name = "galactica-shipbehavior"
 version = "0.0.0"
 edition = "2021"
 

crates/world/src/world.rs

@@ -1,4 +1,4 @@
-use cgmath::{Deg, EuclideanSpace, InnerSpace, Matrix2, Point2, Point3, Rad, Vector2};
+use cgmath::{Deg, EuclideanSpace, InnerSpace, Matrix2, Point2, Rad, Vector2};
 use crossbeam::channel::Receiver;
 use nalgebra::vector;
 use rand::Rng;
@@ -12,7 +12,7 @@ use std::{collections::HashMap, f32::consts::PI};
 use crate::{objects, objects::ProjectileWorldObject, util, wrapper::Wrapper, ShipPhysicsHandle};
 use galactica_content as content;
 use galactica_gameobject as object;
-use galactica_render::{ObjectSprite, ParticleBuilder};
+use galactica_render::ObjectSprite;
 
 /// Keeps track of all objects in the world that we can interact with.
 /// Also wraps our physics engine
@@ -92,7 +92,7 @@ impl<'a> World {
 				.linvel(vector![vel.x, vel.y])
 				.build();
 
-			let collider = ColliderBuilder::ball(1.0)
+			let collider = ColliderBuilder::ball(5.0)
 				.sensor(true)
 				.active_events(ActiveEvents::COLLISION_EVENTS)
 				.build();
@@ -169,7 +169,7 @@ impl<'a> World {
 	}
 
 	/// Step this physics system by `t` seconds
-	pub fn step(&mut self, t: f32, ct: &content::Content, particles: &mut Vec<ParticleBuilder>) {
+	pub fn step(&mut self, t: f32, ct: &content::Content) {
 		// Run ship updates
 		// TODO: maybe reorganize projectile creation?
 		let mut projectiles = Vec::new();
@@ -214,18 +214,6 @@ impl<'a> World {
 					if let Some(s) = self.ships.get_mut(b) {
 						let hit = s.ship.handle_projectile_collision(ct, &p.projectile);
 						if hit {
-							let r = self.get_rigid_body(p.rigid_body);
-							let pos = util::rigidbody_position(r);
-							particles.push(ParticleBuilder {
-								texture: ct.get_texture_handle("particle::blaster"),
-								pos: Point3 {
-									x: pos.x,
-									y: pos.y,
-									z: 1.0, // TODO:remove z coordinate
-								},
-								lifetime: 0.1,
-								size: 10.0,
-							});
 							self.remove_projectile(*a);
 						}
 					}

src/game.rs

@@ -5,10 +5,10 @@ use winit::event::{ElementState, MouseButton, MouseScrollDelta, TouchPhase, Virt
 
 use crate::camera::Camera;
 use crate::{content, inputstatus::InputStatus};
-use galactica_behavior::{behavior, ShipBehavior};
 use galactica_constants;
 use galactica_gameobject as object;
-use galactica_render::{ObjectSprite, ParticleBuilder, UiSprite};
+use galactica_render::{ObjectSprite, UiSprite};
+use galactica_shipbehavior::{behavior, ShipBehavior};
 use galactica_ui as ui;
 use galactica_world::{util, ShipPhysicsHandle, World};
 
@@ -21,14 +21,10 @@ pub struct Game {
 	paused: bool,
 	pub time_scale: f32,
 
-	world: World,
+	physics: World,
 	shipbehaviors: Vec<Box<dyn ShipBehavior>>,
 	playerbehavior: behavior::Player,
 	content: content::Content,
-	pub start_instant: Instant,
-
-	// TODO: clean this up
-	pub new_particles: Vec<ParticleBuilder>,
 }
 
 impl Game {
@@ -89,7 +85,6 @@ impl Game {
 			last_update: Instant::now(),
 			input: InputStatus::new(),
 			player: h1,
-			start_instant: Instant::now(),
 
 			camera: Camera {
 				pos: (0.0, 0.0).into(),
@@ -100,11 +95,10 @@ impl Game {
 
 			paused: false,
 			time_scale: 1.0,
-			world: physics,
+			physics,
 			shipbehaviors,
 			content: ct,
 			playerbehavior: behavior::Player::new(h1),
-			new_particles: Vec::new(),
 		}
 	}
 
@@ -137,19 +131,19 @@ impl Game {
 		self.playerbehavior.key_right = self.input.key_right;
 		self.playerbehavior.key_left = self.input.key_left;
 		self.playerbehavior
-			.update_controls(&mut self.world, &self.content);
+			.update_controls(&mut self.physics, &self.content);
 
 		self.shipbehaviors.retain_mut(|b| {
 			// Remove shipbehaviors of destroyed ships
-			if self.world.get_ship_mut(&b.get_handle()).is_none() {
+			if self.physics.get_ship_mut(&b.get_handle()).is_none() {
 				false
 			} else {
-				b.update_controls(&mut self.world, &self.content);
+				b.update_controls(&mut self.physics, &self.content);
 				true
 			}
 		});
 
-		self.world.step(t, &self.content, &mut self.new_particles);
+		self.physics.step(t, &self.content);
 
 		if self.input.v_scroll != 0.0 {
 			self.camera.zoom = (self.camera.zoom + self.input.v_scroll)
@@ -159,11 +153,11 @@ impl Game {
 
 		// TODO: Camera physics
 		let r = self
-			.world
+			.physics
 			.get_ship_mut(&self.player)
 			.unwrap()
 			.physics_handle;
-		let r = self.world.get_rigid_body(r.0); // TODO: r.0 shouldn't be public
+		let r = self.physics.get_rigid_body(r.0); // TODO: r.0 shouldn't be public
 		let ship_pos = util::rigidbody_position(r);
 		self.camera.pos = ship_pos;
 		self.last_update = Instant::now();
@@ -173,7 +167,7 @@ impl Game {
 		let mut sprites: Vec<ObjectSprite> = Vec::new();
 
 		sprites.append(&mut self.system.get_sprites());
-		sprites.extend(self.world.get_ship_sprites(&self.content));
+		sprites.extend(self.physics.get_ship_sprites(&self.content));
 
 		// Make sure sprites are drawn in the correct order
 		// (note the reversed a, b in the comparator)
@@ -183,7 +177,7 @@ impl Game {
 		sprites.sort_by(|a, b| b.pos.z.total_cmp(&a.pos.z));
 
 		// Don't waste time sorting these, they should always be on top.
-		sprites.extend(self.world.get_projectile_sprites());
+		sprites.extend(self.physics.get_projectile_sprites());
 
 		return sprites;
 	}
@@ -192,7 +186,7 @@ impl Game {
 		return ui::build_radar(
 			&self.content,
 			&self.player,
-			&self.world,
+			&self.physics,
 			&self.system,
 			self.camera.zoom,
 			self.camera.aspect,

src/main.rs

@@ -37,11 +37,6 @@ fn main() -> Result<()> {
 					game.camera.zoom,
 					&game.get_object_sprites(),
 					&game.get_ui_sprites(),
-					// TODO: clean this up, single game data struct
-					// Game in another crate?
-					// Shipbehavior needs game state too...
-					&mut game.new_particles,
-					game.start_instant,
 				) {
 					Ok(_) => {}
 					Err(wgpu::SurfaceError::Lost) => gpu.resize(),