sfja/h5-projekt-mst
1
0
Fork 0
mirror of https://github.com/Mercantec-GHC/h5-projekt-mst.git synced 2026-08-27 05:37:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

add new segement kind

Browse Source
This commit is contained in:
Mikkel Troels Kongsted 2026-04-29 11:23:45 +02:00
parent c0f97dd83d
commit 00ba6c0f00
1 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
game/src/main.rs
View File

@ -239,14 +239,14 @@ impl SegmentFactory {
pub fn random_obstacle_segment(&self, pos: V3) -> Segment { pub fn random_obstacle_segment(&self, pos: V3) -> Segment {
let mut obstacles: Vec<Obstacle> = Vec::new(); let mut obstacles: Vec<Obstacle> = Vec::new();
for i in 1..5 { for i in 1..=4 {
obstacles.push(Obstacle { obstacles.push(Obstacle {
pos: V3( pos: V3(
random::next_in_range_f64( random::next_in_range_f64(
(-self.segment_width / 2.0)..(self.segment_width / 2.0), (-self.segment_width / 2.0)..(self.segment_width / 2.0),
) - 0.1, ) - 0.1,
0.0, 0.0,
self.segment_depth / i as f64, self.segment_depth / 4.0 * i as f64,
), ),
vel: V3(0.0, 0.0, 0.0), vel: V3(0.0, 0.0, 0.0),
size: V3(0.1, 0.1, 0.1), size: V3(0.1, 0.1, 0.1),
@ -257,14 +257,14 @@ impl SegmentFactory {
pub fn moving_obstacle_segment(&self, pos: V3) -> Segment { pub fn moving_obstacle_segment(&self, pos: V3) -> Segment {
let mut obstacles: Vec<Obstacle> = Vec::new(); let mut obstacles: Vec<Obstacle> = Vec::new();
for i in 1..4 { for i in 1..=3 {
obstacles.push(Obstacle { obstacles.push(Obstacle {
pos: V3( pos: V3(
random::next_in_range_f64( random::next_in_range_f64(
(-self.segment_width / 2.0)..(self.segment_width / 2.0), (-self.segment_width / 2.0)..(self.segment_width / 2.0),
) - 0.1, ) - 0.1,
0.0, 0.0,
self.segment_depth / i as f64, self.segment_depth / 3.0 * i as f64,
), ),
vel: V3(0.1, 0.0, 0.0), vel: V3(0.1, 0.0, 0.0),
size: V3(0.1, 0.1, 0.1), size: V3(0.1, 0.1, 0.1),
@ -288,6 +288,33 @@ impl SegmentFactory {
Segment::new(SegmentKind::SlalomObstacles, pos, obstacles) Segment::new(SegmentKind::SlalomObstacles, pos, obstacles)
} }
pub fn curve_obstacle_segment(&self, pos: V3) -> Segment {
let mut obstacles: Vec<Obstacle> = Vec::new();
for i in 1..=6 {
obstacles.push(Obstacle {
pos: V3(
-self.segment_width / 2.0 + i as f64 * 0.1 - 0.1,
0.0,
self.segment_depth / 12.0 * i as f64,
),
vel: V3(0.0, 0.0, 0.0),
size: V3(0.1, 0.1, 0.1),
});
}
for i in 1..=6 {
obstacles.push(Obstacle {
pos: V3(
self.segment_width / 2.0 - i as f64 * 0.1,
0.0,
self.segment_depth / 2.0 + self.segment_depth / 12.0 * i as f64,
),
vel: V3(0.0, 0.0, 0.0),
size: V3(0.1, 0.1, 0.1),
});
}
Segment::new(SegmentKind::CurveObstacles, pos, obstacles)
}
pub fn new_random_segment(&self, pos: V3) -> Segment { pub fn new_random_segment(&self, pos: V3) -> Segment {
let choice: usize = random::next() as usize; let choice: usize = random::next() as usize;
@ -545,6 +572,7 @@ struct Ground {
#[derive(Debug)] #[derive(Debug)]
enum SegmentKind { enum SegmentKind {
CurveObstacles,
RandomObstacles, RandomObstacles,
MovingObstacles, MovingObstacles,
SlalomObstacles, SlalomObstacles,
@ -580,6 +608,7 @@ impl Segment {
} }
} }
SegmentKind::SlalomObstacles => {} SegmentKind::SlalomObstacles => {}
SegmentKind::CurveObstacles => {}
} }
let actual_obstacle_pos = obstacle.pos + self.pos; let actual_obstacle_pos = obstacle.pos + self.pos;
let (skateboard_pos, skateboard_pos_and_size) = ( let (skateboard_pos, skateboard_pos_and_size) = (