Expose offset coordinates to draw(), simplify starlane drawing

rustorion-gui/src/gui-client.rs

@@ -20,7 +20,7 @@ fn icon_by_name(name: &str, size: i32) -> gdk_pixbuf::Pixbuf {
 struct FullDark;
 
 impl Drawable<RustorionState, RustorionEvent> for FullDark {
-	fn draw(&self, ctx: &cairo::Context, _shared_data: &SharedData<RustorionState, RustorionEvent>, _size: [f64; 2]) {
+	fn draw(&self, ctx: &cairo::Context, _shared_data: &SharedData<RustorionState, RustorionEvent>, _dc: DrawContext) {
 		ctx.set_source_rgb(0., 0., 0.);
 		ctx.paint();
 	}
@@ -372,9 +372,9 @@ struct MoveOrder {
 }
 
 impl Drawable<RustorionState, RustorionEvent> for MoveOrder {
-	fn draw(&self, ctx: &cairo::Context, _shared_data: &SharedData<RustorionState, RustorionEvent>, size: [f64; 2]) {
-		let start = [if self.first_is_left { 0.0 } else { size[0] }, if self.first_is_top { 0.0 } else { size[1] }];
-		let end = [if self.first_is_left { size[0] } else { 0.0 }, if self.first_is_top { size[1] } else { 0.0 }];
+	fn draw(&self, ctx: &cairo::Context, _shared_data: &SharedData<RustorionState, RustorionEvent>, dc: DrawContext) {
+		let start = [if self.first_is_left { 0.0 } else { dc.size[0] }, if self.first_is_top { 0.0 } else { dc.size[1] }];
+		let end = [if self.first_is_left { dc.size[0] } else { 0.0 }, if self.first_is_top { dc.size[1] } else { 0.0 }];
 		ctx.set_source_rgb(1., 1., 1.);
 		ctx.set_line_width(2.);
 		let topstart = (start[0], start[1] - 10.0);
@@ -474,7 +474,7 @@ impl<State: 'static, Event: 'static + EventTrait<State>> Scene<State, Event> {
 				ctx.clip_preserve();
 				ctx.translate(coords[0], coords[1]);
 				ctx.new_path();
-				drawable.draw(ctx, &shared_data as &SharedData<State, Event>, size);
+				drawable.draw(ctx, &shared_data as &SharedData<State, Event>, DrawContext { coords, size });
 
 				ctx.pop_group_to_source();
 				ctx.paint();
@@ -508,8 +508,13 @@ impl<State: 'static, Event: 'static + EventTrait<State>> Scene<State, Event> {
 	}
 }
 
+struct DrawContext {
+	coords: [f64; 2],
+	size: [f64; 2],
+}
+
 trait Drawable<State, Event> {
-	fn draw(&self, ctx: &cairo::Context, shared_data: &SharedData<State, Event>, size: [f64; 2]);
+	fn draw(&self, ctx: &cairo::Context, shared_data: &SharedData<State, Event>, dc: DrawContext);
 	fn button_event(&self, _event: &gdk::EventButton) -> Vec<Event> {
 		return vec![];
 	}
@@ -520,8 +525,8 @@ struct Crown {
 }
 
 impl Drawable<RustorionState, RustorionEvent> for Crown {
-	fn draw(&self, ctx: &cairo::Context, _shared_data: &SharedData<RustorionState, RustorionEvent>, size: [f64; 2]) {
-		ctx.set_source_pixbuf(&icon_by_name("crown", size[1] as i32), 0., 0.);
+	fn draw(&self, ctx: &cairo::Context, _shared_data: &SharedData<RustorionState, RustorionEvent>, dc: DrawContext) {
+		ctx.set_source_pixbuf(&icon_by_name("crown", dc.size[1] as i32), 0., 0.);
 		let pat = ctx.get_source();
 
 		ctx.set_source_rgb(self.color[0].into(), self.color[1].into(), self.color[2].into());
@@ -534,14 +539,14 @@ struct StarSystem {
 }
 
 impl Drawable<RustorionState, RustorionEvent> for StarSystem {
-	fn draw(&self, ctx: &cairo::Context, shared_data: &SharedData<RustorionState, RustorionEvent>, size: [f64; 2]) {
+	fn draw(&self, ctx: &cairo::Context, shared_data: &SharedData<RustorionState, RustorionEvent>, dc: DrawContext) {
 		if shared_data.state.focus == Some(FocusData::StarSystem { star_system_id: self.id }) {
-			draw_reticle(ctx, size);
+			draw_reticle(ctx, &dc.size);
 		}
 		let view = shared_data.state.view.borrow();
 		let interface = view.interface();
 		let ss = interface.star_system(self.id).unwrap();
-		ctx.set_source_pixbuf(&icon_by_name("star", size[1] as i32), 0., 0.);
+		ctx.set_source_pixbuf(&icon_by_name("star", dc.size[1] as i32), 0., 0.);
 		let color = ss.empire().map(|e| e.data.color).unwrap_or([1.0, 1.0, 1.0]);
 		let pat = ctx.get_source();
 
@@ -565,33 +570,38 @@ struct Text {
 }
 
 impl Drawable<RustorionState, RustorionEvent> for Text {
-	fn draw(&self, ctx: &cairo::Context, _shared_data: &SharedData<RustorionState, RustorionEvent>, size: [f64; 2]) {
+	fn draw(&self, ctx: &cairo::Context, _shared_data: &SharedData<RustorionState, RustorionEvent>, dc: DrawContext) {
 		ctx.set_source_rgb(1., 1., 1.);
 		ctx.set_font_size(12.);
 		let extent = ctx.text_extents(&self.string);
 		// Align top left
 		ctx.move_to(0.0, extent.height as f64);
-		ctx.rel_move_to(-self.alignment.hoffset(size[0] - extent.width), -self.alignment.voffset(size[1] - extent.height));
+		ctx.rel_move_to(-self.alignment.hoffset(dc.size[0] - extent.width), -self.alignment.voffset(dc.size[1] - extent.height));
 		ctx.show_text(&self.string);
 	}
 }
 
 struct Starlane {
-	inverted: bool,
+	first: [i64; 2],
+	second: [i64; 2],
 }
 
 impl Drawable<RustorionState, RustorionEvent> for Starlane {
-	fn draw(&self, ctx: &cairo::Context, _shared_data: &SharedData<RustorionState, RustorionEvent>, size: [f64; 2]) {
+	fn draw(&self, ctx: &cairo::Context, shared_data: &SharedData<RustorionState, RustorionEvent>, dc: DrawContext) {
 		ctx.set_source_rgb(0.5, 0.5, 0.5);
 		ctx.set_line_width(2.);
-		let (first, second) = if self.inverted { ((0., size[1]), (size[0], 0.)) } else { ((0., 0.), (size[0], size[1])) };
-		ctx.move_to(first.0, first.1);
-		ctx.line_to(second.0, second.1);
+		// TODO: coords types and arithmetic
+		let first = shared_data.translate_coords(self.first);
+		let first = [first[0] - dc.coords[0], first[1] - dc.coords[1]];
+		let second = shared_data.translate_coords(self.second);
+		let second = [second[0] - dc.coords[0], second[1] - dc.coords[1]];
+		ctx.move_to(first[0], first[1]);
+		ctx.line_to(second[0], second[1]);
 		ctx.stroke();
 	}
 }
 
-fn draw_reticle(ctx: &cairo::Context, size: [f64; 2]) {
+fn draw_reticle(ctx: &cairo::Context, size: &[f64; 2]) {
 	ctx.set_source_pixbuf(&icon_by_name("reticle", size[0].min(size[1]) as i32), 0., 0.);
 	let pat = ctx.get_source();
 	ctx.set_source_rgb(0.9, 0.1, 0.1);
@@ -604,20 +614,20 @@ struct Fleet {
 }
 
 impl Drawable<RustorionState, RustorionEvent> for Fleet {
-	fn draw(&self, ctx: &cairo::Context, shared_data: &SharedData<RustorionState, RustorionEvent>, size: [f64; 2]) {
+	fn draw(&self, ctx: &cairo::Context, shared_data: &SharedData<RustorionState, RustorionEvent>, dc: DrawContext) {
 		if shared_data.state.focus
 			== Some(FocusData::Fleet {
 				star_system_id: self.star_system_id,
 				empire_id: self.empire_id,
 			}) {
-			draw_reticle(ctx, size);
+			draw_reticle(ctx, &dc.size);
 		}
 
 		let view = shared_data.state.view.borrow();
 		let ui = view.interface();
 		let empire = self.empire_id.map(|id| ui.empire(id)).unwrap();
 
-		ctx.set_source_pixbuf(&icon_by_name("ship", size[1] as i32), 0., 0.);
+		ctx.set_source_pixbuf(&icon_by_name("ship", dc.size[1] as i32), 0., 0.);
 
 		let color = empire.map(|e| e.data.color).unwrap_or([1.0, 1.0, 1.0]);
 		let pat = ctx.get_source();
@@ -643,8 +653,8 @@ impl Drawable<RustorionState, RustorionEvent> for Fleet {
 struct BlackCircle;
 
 impl Drawable<RustorionState, RustorionEvent> for BlackCircle {
-	fn draw(&self, ctx: &cairo::Context, _shared_data: &SharedData<RustorionState, RustorionEvent>, size: [f64; 2]) {
-		ctx.arc(size[0] / 2., size[1] / 2., size[1] / 2., 0., 2. * 3.14);
+	fn draw(&self, ctx: &cairo::Context, _shared_data: &SharedData<RustorionState, RustorionEvent>, dc: DrawContext) {
+		ctx.arc(dc.size[0] / 2., dc.size[1] / 2., dc.size[1] / 2., 0., 2. * 3.14);
 		ctx.set_source_rgba(0., 0., 0., 1.);
 		ctx.fill();
 		ctx.stroke();
@@ -732,8 +742,6 @@ fn main() -> Result<()> {
 
 		for (s1, s2) in lanes {
 			let (l1, l2) = (s1.data.location, s2.data.location);
-			let (l1, l2) = if l1.x > l2.x { (l2, l1) } else { (l1, l2) };
-			let inverted = l1.y > l2.y;
 			let x = l1.x.min(l2.x);
 			let y = l1.y.min(l2.y);
 			let width = l1.x.max(l2.x) - x;
@@ -745,7 +753,7 @@ fn main() -> Result<()> {
 					z_index: -50,
 					..Default::default()
 				},
-				Starlane { inverted },
+				Starlane { first: l1.into(), second: l2.into() },
 			);
 		}