Kelder/planet-wars
32
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

too late commit lol

Browse source
This commit is contained in:
ajuvercr 2020-04-17 15:12:11 +02:00
parent a1cfa658e9
commit ef06cf93a3
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
frontend/src/lib.rs
View file

@ -44,6 +44,11 @@ fn spr(from: f32) -> f32 {
impl Circle { impl Circle {
pub fn new(p1: &types::Planet, p2: &types::Planet) -> Self { pub fn new(p1: &types::Planet, p2: &types::Planet) -> Self {
use std::f32::consts::PI;
let pi2 = 2.0 * PI;
console_log!("Test");
let x1 = p1.x; let x1 = p1.x;
let y1 = p1.y; let y1 = p1.y;
let x2 = p2.x; let x2 = p2.x;
@ -284,6 +289,10 @@ impl Game {
}).collect(); }).collect();
} }
<<<<<<< HEAD
=======
>>>>>>> e5af4f4... too late commit lol
fn update_ship_counts(&mut self) { fn update_ship_counts(&mut self) {
self.ship_counts = self.states[self.turn].expeditions.iter().map(|s| { self.ship_counts = self.states[self.turn].expeditions.iter().map(|s| {
s.ship_count as usize s.ship_count as usize

4
frontend/www/index.ts
View file

@ -29,8 +29,8 @@ const COUNTER = new FPSCounter();
const LOADER = document.getElementById("main"); const LOADER = document.getElementById("main");
const SLIDER = <HTMLInputElement>document.getElementById("turnSlider"); const SLIDER = <HTMLInputElement>document.getElementById("turnSlider");
const FILESELECTOR = <HTMLInputElement> document.getElementById("fileselect"); const FILESELECTOR = <HTMLInputElement>document.getElementById("fileselect");
const SPEED = <HTMLInputElement> document.getElementById("speed"); const SPEED = <HTMLInputElement>document.getElementById("speed");
export function set_loading(loading: boolean) { export function set_loading(loading: boolean) {
if (loading) { if (loading) {