initial game prototype

This commit is contained in:
Thilo Behnke
2022-04-15 17:07:43 +02:00
parent 422bb76a0b
commit 046fcded31
19 changed files with 1391 additions and 6 deletions

View File

@@ -1,6 +1,24 @@
mod utils;
use serde::{Deserialize, Serialize};
use serde_json::json;
use std::cmp::{max, min};
use wasm_bindgen::prelude::*;
use pong::collision::collision::{Collision, CollisionDetector};
use pong::game_field::{Field, Input, InputType};
use pong::game_object::game_object::{GameObject, Shape};
use pong::geom::geom::Vector;
use pong::utils::utils::Logger;
extern crate serde_json;
extern crate web_sys;
// A macro to provide `println!(..)`-style syntax for `console.log` logging.
macro_rules! log {
( $( $t:tt )* ) => {
web_sys::console::log_1(&format!( $( $t )* ).into());
}
}
// When the `wee_alloc` feature is enabled, use `wee_alloc` as the global
// allocator.
@@ -9,11 +27,137 @@ use wasm_bindgen::prelude::*;
static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
#[wasm_bindgen]
extern {
fn alert(s: &str);
#[repr(packed)]
#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize)]
pub struct GameObjectDTO {
pub id: u16,
pub x: u16,
pub y: u16,
pub shape_param_1: u16,
pub shape_param_2: u16,
}
impl GameObjectDTO {
pub fn from(obj: &GameObject) -> GameObjectDTO {
return GameObjectDTO {
id: obj.id,
x: obj.pos.x as u16,
y: obj.pos.y as u16,
shape_param_1: match obj.shape_params[..] {
[p1, _] => p1,
[p1] => p1,
_ => 0,
},
shape_param_2: match obj.shape_params[..] {
[_, p2] => p2,
_ => 0,
},
};
}
}
#[wasm_bindgen]
pub fn greet() {
alert("Hello, rust-wasm!");
#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
pub enum InputTypeDTO {
UP,
DOWN,
}
impl InputTypeDTO {
pub fn to_input_type(&self) -> InputType {
match self {
InputTypeDTO::UP => InputType::UP,
InputTypeDTO::DOWN => InputType::DOWN
}
}
}
#[wasm_bindgen]
#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
pub struct InputDTO {
pub input: InputTypeDTO,
pub obj_id: u16,
}
impl InputDTO {
pub fn to_input(&self) -> Input {
return Input {
input: self.input.to_input_type(),
obj_id: self.obj_id,
}
}
}
#[wasm_bindgen]
pub struct FieldWrapper {
field: Field
}
#[wasm_bindgen]
impl FieldWrapper {
pub fn new() -> FieldWrapper {
let field = Field::new(Box::new(WasmLogger {}));
FieldWrapper {
field
}
}
pub fn width(&self) -> u16 {
self.field.width
}
pub fn height(&self) -> u16 {
self.field.height
}
pub fn tick(&mut self, inputs_js: &JsValue) {
let input_dtos: Vec<InputDTO> = inputs_js.into_serde().unwrap();
let inputs = input_dtos.into_iter().map(|i| i.to_input()).collect::<Vec<Input>>();
self.field.tick(inputs);
// log!("{:?}", self.field.collisions);
}
pub fn objects(&self) -> *const GameObjectDTO {
let mut objs = vec![];
objs.append(
&mut self.field
.balls
.iter()
.map(|ball| GameObjectDTO::from(&ball.obj))
.collect::<Vec<GameObjectDTO>>(),
);
objs.append(
&mut self.field
.players
.iter()
.map(|player| GameObjectDTO::from(&player.obj))
.collect::<Vec<GameObjectDTO>>(),
);
objs.append(
&mut self.field
.bounds.objs
.iter()
.map(|bound| GameObjectDTO::from(&bound))
.collect::<Vec<GameObjectDTO>>()
);
objs.as_ptr()
}
pub fn get_state(&self) -> String {
let json = json!(GameObjectDTO {
shape_param_1: 0,
shape_param_2: 0,
x: 10,
y: 10,
id: 1
});
serde_json::to_string(&json).unwrap()
}
}
pub struct WasmLogger {}
impl Logger for WasmLogger {
fn log(&self, msg: &str) {
log!("{}", msg)
}
}