mirror of
https://github.com/Mercantec-GHC/h5-projekt-mst.git
synced 2026-08-27 05:37:39 +02:00
render ground infinitely and move skateboard
This commit is contained in:
parent
398ce3675a
commit
474a32ae4f
@ -28,8 +28,15 @@ pub enum Color {
|
||||
Black,
|
||||
}
|
||||
|
||||
#[derive(PartialEq, Eq, Hash)]
|
||||
pub enum Key {
|
||||
Left,
|
||||
Right,
|
||||
}
|
||||
|
||||
pub enum Event {
|
||||
Exit,
|
||||
KeyUp { key: Key },
|
||||
KeyDown { key: Key },
|
||||
}
|
||||
|
||||
pub trait Game<R: Renderer> {
|
||||
|
||||
@ -64,6 +64,39 @@ impl SdlIo {
|
||||
keycode: Some(Keycode::Escape),
|
||||
..
|
||||
} => break 'running,
|
||||
Event::KeyDown { keycode, .. } => match keycode {
|
||||
Some(key) => match key {
|
||||
Keycode::Left => {
|
||||
game.event(game::Event::KeyDown {
|
||||
key: game::Key::Left,
|
||||
});
|
||||
}
|
||||
Keycode::Right => {
|
||||
game.event(game::Event::KeyDown {
|
||||
key: game::Key::Right,
|
||||
});
|
||||
}
|
||||
_ => {}
|
||||
},
|
||||
None => {}
|
||||
},
|
||||
Event::KeyUp { keycode, .. } => match keycode {
|
||||
Some(key) => match key {
|
||||
Keycode::Left => {
|
||||
game.event(game::Event::KeyUp {
|
||||
key: game::Key::Left,
|
||||
});
|
||||
}
|
||||
Keycode::Right => {
|
||||
game.event(game::Event::KeyUp {
|
||||
key: game::Key::Right,
|
||||
});
|
||||
}
|
||||
_ => {}
|
||||
},
|
||||
None => {}
|
||||
},
|
||||
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
|
||||
129
game/src/main.rs
129
game/src/main.rs
@ -1,13 +1,14 @@
|
||||
#![allow(dead_code)]
|
||||
|
||||
use std::{
|
||||
collections::HashSet,
|
||||
f64::consts::PI,
|
||||
sync::{Arc, Mutex},
|
||||
time::Duration,
|
||||
};
|
||||
|
||||
use crate::{
|
||||
engine::{Color, Renderer, Scene, Shape, V3},
|
||||
engine::{Color, Key, Renderer, Scene, Shape, V3},
|
||||
event_queue::EventQueue,
|
||||
vermiparous::Server,
|
||||
};
|
||||
@ -20,6 +21,7 @@ struct Game {
|
||||
objects: Vec<Object>,
|
||||
next_object_id: u32,
|
||||
event_queue: Arc<Mutex<EventQueue>>,
|
||||
keys_pressed: HashSet<Key>,
|
||||
}
|
||||
|
||||
impl Game {
|
||||
@ -28,6 +30,7 @@ impl Game {
|
||||
objects: Vec::new(),
|
||||
next_object_id: 0,
|
||||
event_queue,
|
||||
keys_pressed: HashSet::new(),
|
||||
}
|
||||
}
|
||||
|
||||
@ -53,6 +56,18 @@ impl Game {
|
||||
impl<R: Renderer> engine::Game<R> for Game {
|
||||
fn update(&mut self, delta_time: Duration) {
|
||||
for object in &mut self.objects {
|
||||
if self.keys_pressed.contains(&Key::Left) {
|
||||
match &mut object.kind {
|
||||
ObjectKind::SkateBoard { vel, .. } => vel.0 -= 0.01,
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
if self.keys_pressed.contains(&Key::Right) {
|
||||
match &mut object.kind {
|
||||
ObjectKind::SkateBoard { vel, .. } => vel.0 += 0.01,
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
object.update(delta_time);
|
||||
}
|
||||
}
|
||||
@ -65,7 +80,12 @@ impl<R: Renderer> engine::Game<R> for Game {
|
||||
scene.render(r, V3(0.0, 0.0, -1.0));
|
||||
}
|
||||
|
||||
fn event(&mut self, event: engine::Event) {}
|
||||
fn event(&mut self, event: engine::Event) {
|
||||
match event {
|
||||
engine::Event::KeyDown { key } => self.keys_pressed.insert(key),
|
||||
engine::Event::KeyUp { key } => self.keys_pressed.remove(&key),
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
struct Object {
|
||||
@ -74,22 +94,37 @@ struct Object {
|
||||
}
|
||||
|
||||
enum ObjectKind {
|
||||
SkateBoard { pos: V3, vel: V3, rot: V3 },
|
||||
Obstacle { pos: V3, vel: V3 },
|
||||
Ground { pos: V3, vel_z: f64 },
|
||||
SkateBoard {
|
||||
pos: V3,
|
||||
vel: V3,
|
||||
rot: V3,
|
||||
},
|
||||
Obstacle {
|
||||
pos: V3,
|
||||
vel: V3,
|
||||
},
|
||||
Ground {
|
||||
original_pos: V3,
|
||||
pos: V3,
|
||||
vel: V3,
|
||||
rot: V3,
|
||||
grid_item_size: f64,
|
||||
grid_width: i32,
|
||||
grid_depth: i32,
|
||||
},
|
||||
}
|
||||
|
||||
struct MultiShapeShape {
|
||||
struct ShapeGroupShape {
|
||||
shape: Shape,
|
||||
offset: V3,
|
||||
}
|
||||
|
||||
struct MultiShape {
|
||||
shapes: Vec<MultiShapeShape>,
|
||||
struct ShapeGroup {
|
||||
shapes: Vec<ShapeGroupShape>,
|
||||
}
|
||||
|
||||
impl MultiShape {
|
||||
pub fn new(shapes: Vec<MultiShapeShape>) -> Self {
|
||||
impl ShapeGroup {
|
||||
pub fn new(shapes: Vec<ShapeGroupShape>) -> Self {
|
||||
Self { shapes }
|
||||
}
|
||||
pub fn rotate(mut self, rot: V3) -> Self {
|
||||
@ -125,18 +160,27 @@ impl Object {
|
||||
match &mut self.kind {
|
||||
ObjectKind::SkateBoard { pos, vel, rot } => {
|
||||
*pos += *vel * delta_time.as_secs_f64();
|
||||
if pos.0 >= 2.1 {
|
||||
pos.0 = -2.0;
|
||||
}
|
||||
|
||||
// rot.0 += delta_time.as_secs_f64() * PI * 1.0;
|
||||
rot.1 += delta_time.as_secs_f64() * PI * 1.0;
|
||||
// rot.1 += delta_time.as_secs_f64() * PI * 1.0;
|
||||
// rot.2 += delta_time.as_secs_f64() * PI * 2.0;
|
||||
}
|
||||
ObjectKind::Obstacle { pos, vel } => {
|
||||
*pos += *vel * delta_time.as_secs_f64();
|
||||
}
|
||||
ObjectKind::Ground { pos, vel_z } => {
|
||||
pos.2 += *vel_z * delta_time.as_secs_f64();
|
||||
ObjectKind::Ground {
|
||||
pos,
|
||||
vel,
|
||||
grid_depth,
|
||||
grid_item_size,
|
||||
original_pos,
|
||||
..
|
||||
} => {
|
||||
*pos += *vel * delta_time.as_secs_f64();
|
||||
*vel += V3(vel.0, vel.1, vel.0 - 0.01 * delta_time.as_secs_f64());
|
||||
if pos.2 <= original_pos.2 - *grid_depth as f64 * *grid_item_size as f64 {
|
||||
pos.2 += *grid_depth as f64 * *grid_item_size as f64
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -144,16 +188,16 @@ impl Object {
|
||||
fn render(&self, scene: &mut Scene) {
|
||||
match self.kind {
|
||||
ObjectKind::SkateBoard { pos, rot, .. } => {
|
||||
let board = MultiShape::new(vec![
|
||||
MultiShapeShape {
|
||||
let board = ShapeGroup::new(vec![
|
||||
ShapeGroupShape {
|
||||
shape: Shape::new_cube(V3(0.2, 0.01, 0.05)),
|
||||
offset: V3(0.0, 0.0, 0.0),
|
||||
},
|
||||
MultiShapeShape {
|
||||
ShapeGroupShape {
|
||||
shape: Shape::new_cube(V3(0.02, 0.02, 0.05)),
|
||||
offset: V3(0.04, -0.02, 0.0),
|
||||
},
|
||||
MultiShapeShape {
|
||||
ShapeGroupShape {
|
||||
shape: Shape::new_cube(V3(0.02, 0.02, 0.05)),
|
||||
offset: V3(0.14, -0.02, 0.0),
|
||||
},
|
||||
@ -170,16 +214,30 @@ impl Object {
|
||||
Color::Black,
|
||||
);
|
||||
}
|
||||
ObjectKind::Ground { pos, .. } => {
|
||||
for z in 0..10 {
|
||||
for x in -10..10 {
|
||||
scene.draw_shape(
|
||||
V3(x as f64 * 0.1 + pos.0, pos.1, z as f64 * 0.1 + pos.2),
|
||||
&Shape::new_plane(V3(0.1, 0.0, 0.1)),
|
||||
Color::Cyan,
|
||||
Color::Black,
|
||||
);
|
||||
ObjectKind::Ground {
|
||||
pos,
|
||||
grid_depth,
|
||||
grid_item_size,
|
||||
grid_width,
|
||||
..
|
||||
} => {
|
||||
for grid in 0..5 {
|
||||
let mut shapes = Vec::new();
|
||||
for z in 0..grid_depth {
|
||||
for x in -grid_width / 2..grid_width / 2 {
|
||||
shapes.push(ShapeGroupShape {
|
||||
shape: Shape::new_plane(V3(grid_item_size, 0.0, grid_item_size)),
|
||||
offset: V3(
|
||||
x as f64 * grid_item_size,
|
||||
0.0,
|
||||
z as f64 * grid_item_size
|
||||
+ grid as f64 * grid_depth as f64 * grid_item_size,
|
||||
),
|
||||
});
|
||||
}
|
||||
}
|
||||
let ground = ShapeGroup::new(shapes);
|
||||
ground.draw(pos, scene, Color::Cyan, Color::Black);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -196,13 +254,18 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||
});
|
||||
let mut objects: Vec<ObjectKind> = Vec::new();
|
||||
objects.push(ObjectKind::SkateBoard {
|
||||
pos: V3(0.0, -0.1, 0.0),
|
||||
pos: V3(0.0, -0.1, -0.7),
|
||||
vel: V3(0.0, 0.0, 0.0),
|
||||
rot: V3(0.0, 0.0, 0.0),
|
||||
rot: V3(0.0, PI * 0.5, 0.0),
|
||||
});
|
||||
objects.push(ObjectKind::Ground {
|
||||
pos: V3(0.0, -0.3, -0.5),
|
||||
vel_z: -0.1,
|
||||
original_pos: V3(0.0, -0.25, -0.6),
|
||||
pos: V3(0.0, -0.25, -0.6),
|
||||
vel: V3(0.0, 0.0, -0.1),
|
||||
rot: V3(0.0, 0.0, 0.0),
|
||||
grid_item_size: 0.1,
|
||||
grid_width: 10,
|
||||
grid_depth: 10,
|
||||
});
|
||||
objects.push(ObjectKind::Obstacle {
|
||||
pos: V3(0.5, -0.2, 0.0),
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user