rust/hwphysics/src/lib.rs
author alfadur
Thu, 25 Jul 2019 19:58:19 +0300
changeset 15291 7446258fab98
parent 15287 b58f98bbc120
child 15295 42b710b0f883
permissions -rw-r--r--
add time events
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
14737
8e74d4eb89f5 add random falling stuff
alfadur
parents: 14200
diff changeset
     1
pub mod collision;
8e74d4eb89f5 add random falling stuff
alfadur
parents: 14200
diff changeset
     2
pub mod common;
14199
a4c17cfaa4c9 split hwphysics into modules
alfadur
parents: 14165
diff changeset
     3
mod grid;
14737
8e74d4eb89f5 add random falling stuff
alfadur
parents: 14200
diff changeset
     4
pub mod physics;
15291
7446258fab98 add time events
alfadur
parents: 15287
diff changeset
     5
pub mod time;
14165
165e43c3ed59 pull land into collision detector
alfadur
parents: 14080
diff changeset
     6
14199
a4c17cfaa4c9 split hwphysics into modules
alfadur
parents: 14165
diff changeset
     7
use fpnum::FPNum;
14200
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
     8
use integral_geometry::Size;
14165
165e43c3ed59 pull land into collision detector
alfadur
parents: 14080
diff changeset
     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
a4c17cfaa4c9 split hwphysics into modules
alfadur
parents: 14165
diff changeset
    11
use crate::{
14737
8e74d4eb89f5 add random falling stuff
alfadur
parents: 14200
diff changeset
    12
    collision::{CollisionData, CollisionProcessor, ContactData},
8e74d4eb89f5 add random falling stuff
alfadur
parents: 14200
diff changeset
    13
    common::{GearData, GearDataAggregator, GearDataProcessor, GearId},
8e74d4eb89f5 add random falling stuff
alfadur
parents: 14200
diff changeset
    14
    physics::{PhysicsData, PhysicsProcessor},
15291
7446258fab98 add time events
alfadur
parents: 15287
diff changeset
    15
    time::TimeProcessor,
14199
a4c17cfaa4c9 split hwphysics into modules
alfadur
parents: 14165
diff changeset
    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
a4c17cfaa4c9 split hwphysics into modules
alfadur
parents: 14165
diff changeset
    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
8e74d4eb89f5 add random falling stuff
alfadur
parents: 14200
diff changeset
    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
a4c17cfaa4c9 split hwphysics into modules
alfadur
parents: 14165
diff changeset
    26
    physics: PhysicsProcessor,
a4c17cfaa4c9 split hwphysics into modules
alfadur
parents: 14165
diff changeset
    27
    collision: CollisionProcessor,
15291
7446258fab98 add time events
alfadur
parents: 15287
diff changeset
    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
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
    31
macro_rules! processor_map {
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
    32
    ( $data_type: ident => $field: ident ) => {
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
    33
        impl GearDataAggregator<$data_type> for World {
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
    34
            fn find_processor(&mut self) -> &mut GearDataProcessor<$data_type> {
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
    35
                &mut self.$field
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
    36
            }
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
    37
        }
14737
8e74d4eb89f5 add random falling stuff
alfadur
parents: 14200
diff changeset
    38
    };
14200
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
    39
}
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
    40
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
    41
processor_map!(PhysicsData => physics);
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
    42
processor_map!(CollisionData => collision);
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
    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
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
    45
    pub fn new(world_size: Size) -> Self {
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
    46
        Self {
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
    47
            physics: PhysicsProcessor::new(),
14737
8e74d4eb89f5 add random falling stuff
alfadur
parents: 14200
diff changeset
    48
            collision: CollisionProcessor::new(world_size),
15291
7446258fab98 add time events
alfadur
parents: 15287
diff changeset
    49
            time: TimeProcessor::new(),
14200
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
    50
        }
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
    51
    }
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
    52
14165
165e43c3ed59 pull land into collision detector
alfadur
parents: 14080
diff changeset
    53
    pub fn step(&mut self, time_step: FPNum, land: &Land2D<u32>) {
14199
a4c17cfaa4c9 split hwphysics into modules
alfadur
parents: 14165
diff changeset
    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
7446258fab98 add time events
alfadur
parents: 15287
diff changeset
    56
        let events = self.time.process(time_step);
14165
165e43c3ed59 pull land into collision detector
alfadur
parents: 14080
diff changeset
    57
    }
165e43c3ed59 pull land into collision detector
alfadur
parents: 14080
diff changeset
    58
14200
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
    59
    pub fn add_gear_data<T>(&mut self, gear_id: GearId, data: T)
14737
8e74d4eb89f5 add random falling stuff
alfadur
parents: 14200
diff changeset
    60
    where
8e74d4eb89f5 add random falling stuff
alfadur
parents: 14200
diff changeset
    61
        T: GearData,
8e74d4eb89f5 add random falling stuff
alfadur
parents: 14200
diff changeset
    62
        Self: GearDataAggregator<T>,
14200
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
    63
    {
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
    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
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
    70
    use crate::{
14737
8e74d4eb89f5 add random falling stuff
alfadur
parents: 14200
diff changeset
    71
        collision::{CircleBounds, CollisionData},
14200
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
    72
        physics::PhysicsData,
14737
8e74d4eb89f5 add random falling stuff
alfadur
parents: 14200
diff changeset
    73
        World,
14200
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
    74
    };
14737
8e74d4eb89f5 add random falling stuff
alfadur
parents: 14200
diff changeset
    75
    use fpnum::{fp, FPNum, FPPoint};
14200
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
    76
    use integral_geometry::Size;
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
    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
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
    79
    #[test]
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
    80
    fn data_flow() {
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
    81
        let world_size = Size::new(2048, 2048);
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
    82
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
    83
        let mut world = World::new(world_size);
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
    84
        let gear_id = 46631;
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
    85
14737
8e74d4eb89f5 add random falling stuff
alfadur
parents: 14200
diff changeset
    86
        world.add_gear_data(
8e74d4eb89f5 add random falling stuff
alfadur
parents: 14200
diff changeset
    87
            gear_id,
8e74d4eb89f5 add random falling stuff
alfadur
parents: 14200
diff changeset
    88
            PhysicsData {
8e74d4eb89f5 add random falling stuff
alfadur
parents: 14200
diff changeset
    89
                position: FPPoint::zero(),
8e74d4eb89f5 add random falling stuff
alfadur
parents: 14200
diff changeset
    90
                velocity: FPPoint::unit_y(),
8e74d4eb89f5 add random falling stuff
alfadur
parents: 14200
diff changeset
    91
            },
8e74d4eb89f5 add random falling stuff
alfadur
parents: 14200
diff changeset
    92
        );
14200
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
    93
14737
8e74d4eb89f5 add random falling stuff
alfadur
parents: 14200
diff changeset
    94
        world.add_gear_data(
8e74d4eb89f5 add random falling stuff
alfadur
parents: 14200
diff changeset
    95
            gear_id,
8e74d4eb89f5 add random falling stuff
alfadur
parents: 14200
diff changeset
    96
            CollisionData {
8e74d4eb89f5 add random falling stuff
alfadur
parents: 14200
diff changeset
    97
                bounds: CircleBounds {
8e74d4eb89f5 add random falling stuff
alfadur
parents: 14200
diff changeset
    98
                    center: FPPoint::zero(),
8e74d4eb89f5 add random falling stuff
alfadur
parents: 14200
diff changeset
    99
                    radius: fp!(10),
8e74d4eb89f5 add random falling stuff
alfadur
parents: 14200
diff changeset
   100
                },
8e74d4eb89f5 add random falling stuff
alfadur
parents: 14200
diff changeset
   101
            },
8e74d4eb89f5 add random falling stuff
alfadur
parents: 14200
diff changeset
   102
        );
14200
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
   103
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
   104
        let land = Land2D::new(Size::new(world_size.width - 2, world_size.height - 2), 0);
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
   105
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
   106
        world.step(fp!(1), &land);
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
   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
}