author | alfadur |
Thu, 25 Jul 2019 19:58:19 +0300 | |
changeset 15291 | 7446258fab98 |
parent 15287 | b58f98bbc120 |
child 15295 | 42b710b0f883 |
permissions | -rw-r--r-- |
14737 | 1 |
pub mod collision; |
2 |
pub mod common; |
|
14199 | 3 |
mod grid; |
14737 | 4 |
pub mod physics; |
15291 | 5 |
pub mod time; |
14165 | 6 |
|
14199 | 7 |
use fpnum::FPNum; |
14200 | 8 |
use integral_geometry::Size; |
14165 | 9 |
use land2d::Land2D; |
14080
c6745a1c827a
start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
diff
changeset
|
10 |
|
14199 | 11 |
use crate::{ |
14737 | 12 |
collision::{CollisionData, CollisionProcessor, ContactData}, |
13 |
common::{GearData, GearDataAggregator, GearDataProcessor, GearId}, |
|
14 |
physics::{PhysicsData, PhysicsProcessor}, |
|
15291 | 15 |
time::TimeProcessor, |
14199 | 16 |
}; |
14080
c6745a1c827a
start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
diff
changeset
|
17 |
|
c6745a1c827a
start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
diff
changeset
|
18 |
pub struct JoinedData { |
14199 | 19 |
gear_id: GearId, |
14080
c6745a1c827a
start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
diff
changeset
|
20 |
physics: PhysicsData, |
c6745a1c827a
start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
diff
changeset
|
21 |
collision: CollisionData, |
14737 | 22 |
contact: ContactData, |
14080
c6745a1c827a
start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
diff
changeset
|
23 |
} |
c6745a1c827a
start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
diff
changeset
|
24 |
|
c6745a1c827a
start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
diff
changeset
|
25 |
pub struct World { |
14199 | 26 |
physics: PhysicsProcessor, |
27 |
collision: CollisionProcessor, |
|
15291 | 28 |
time: TimeProcessor, |
14080
c6745a1c827a
start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
diff
changeset
|
29 |
} |
c6745a1c827a
start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
diff
changeset
|
30 |
|
14200 | 31 |
macro_rules! processor_map { |
32 |
( $data_type: ident => $field: ident ) => { |
|
33 |
impl GearDataAggregator<$data_type> for World { |
|
34 |
fn find_processor(&mut self) -> &mut GearDataProcessor<$data_type> { |
|
35 |
&mut self.$field |
|
36 |
} |
|
37 |
} |
|
14737 | 38 |
}; |
14200 | 39 |
} |
40 |
||
41 |
processor_map!(PhysicsData => physics); |
|
42 |
processor_map!(CollisionData => collision); |
|
43 |
||
14080
c6745a1c827a
start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
diff
changeset
|
44 |
impl World { |
14200 | 45 |
pub fn new(world_size: Size) -> Self { |
46 |
Self { |
|
47 |
physics: PhysicsProcessor::new(), |
|
14737 | 48 |
collision: CollisionProcessor::new(world_size), |
15291 | 49 |
time: TimeProcessor::new(), |
14200 | 50 |
} |
51 |
} |
|
52 |
||
14165 | 53 |
pub fn step(&mut self, time_step: FPNum, land: &Land2D<u32>) { |
14199 | 54 |
let updates = self.physics.process(time_step); |
15287
b58f98bbc120
clear intermediate result structures between iterations
alfadur
parents:
14737
diff
changeset
|
55 |
let collision = self.collision.process(land, &updates); |
15291 | 56 |
let events = self.time.process(time_step); |
14165 | 57 |
} |
58 |
||
14200 | 59 |
pub fn add_gear_data<T>(&mut self, gear_id: GearId, data: T) |
14737 | 60 |
where |
61 |
T: GearData, |
|
62 |
Self: GearDataAggregator<T>, |
|
14200 | 63 |
{ |
64 |
self.find_processor().add(gear_id, data); |
|
14080
c6745a1c827a
start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
diff
changeset
|
65 |
} |
c6745a1c827a
start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
diff
changeset
|
66 |
} |
c6745a1c827a
start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
diff
changeset
|
67 |
|
c6745a1c827a
start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
diff
changeset
|
68 |
#[cfg(test)] |
c6745a1c827a
start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
diff
changeset
|
69 |
mod tests { |
14200 | 70 |
use crate::{ |
14737 | 71 |
collision::{CircleBounds, CollisionData}, |
14200 | 72 |
physics::PhysicsData, |
14737 | 73 |
World, |
14200 | 74 |
}; |
14737 | 75 |
use fpnum::{fp, FPNum, FPPoint}; |
14200 | 76 |
use integral_geometry::Size; |
77 |
use land2d::Land2D; |
|
14080
c6745a1c827a
start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
diff
changeset
|
78 |
|
14200 | 79 |
#[test] |
80 |
fn data_flow() { |
|
81 |
let world_size = Size::new(2048, 2048); |
|
82 |
||
83 |
let mut world = World::new(world_size); |
|
84 |
let gear_id = 46631; |
|
85 |
||
14737 | 86 |
world.add_gear_data( |
87 |
gear_id, |
|
88 |
PhysicsData { |
|
89 |
position: FPPoint::zero(), |
|
90 |
velocity: FPPoint::unit_y(), |
|
91 |
}, |
|
92 |
); |
|
14200 | 93 |
|
14737 | 94 |
world.add_gear_data( |
95 |
gear_id, |
|
96 |
CollisionData { |
|
97 |
bounds: CircleBounds { |
|
98 |
center: FPPoint::zero(), |
|
99 |
radius: fp!(10), |
|
100 |
}, |
|
101 |
}, |
|
102 |
); |
|
14200 | 103 |
|
104 |
let land = Land2D::new(Size::new(world_size.width - 2, world_size.height - 2), 0); |
|
105 |
||
106 |
world.step(fp!(1), &land); |
|
107 |
} |
|
14080
c6745a1c827a
start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
diff
changeset
|
108 |
} |