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