rust/hwphysics/src/lib.rs
author alfadur
Fri, 13 Nov 2020 20:54:00 +0300
changeset 15784 84c07aa94b61
parent 15404 701ad89a9f2a
child 15790 704f00889f3a
permissions -rw-r--r--
start drawing gears
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;
15326
0076bf602969 start gear data group implementation
alfadur
parents: 15302
diff changeset
     3
mod data;
14199
a4c17cfaa4c9 split hwphysics into modules
alfadur
parents: 14165
diff changeset
     4
mod grid;
14737
8e74d4eb89f5 add random falling stuff
alfadur
parents: 14200
diff changeset
     5
pub mod physics;
15291
7446258fab98 add time events
alfadur
parents: 15287
diff changeset
     6
pub mod time;
14165
165e43c3ed59 pull land into collision detector
alfadur
parents: 14080
diff changeset
     7
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::{
15402
52844baced17 add gravity
alfadur
parents: 15401
diff changeset
    12
    collision::CollisionProcessor,
15401
6e3e5be8b2e2 update hwphysics motion to use the new system
alfadur
parents: 15374
diff changeset
    13
    common::{GearAllocator, GearId, Millis},
15784
84c07aa94b61 start drawing gears
alfadur
parents: 15404
diff changeset
    14
    data::{DataIterator, GearDataManager, TypeIter},
15401
6e3e5be8b2e2 update hwphysics motion to use the new system
alfadur
parents: 15374
diff changeset
    15
    physics::PhysicsProcessor,
15291
7446258fab98 add time events
alfadur
parents: 15287
diff changeset
    16
    time::TimeProcessor,
14199
a4c17cfaa4c9 split hwphysics into modules
alfadur
parents: 14165
diff changeset
    17
};
14080
c6745a1c827a start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
diff changeset
    18
c6745a1c827a start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
diff changeset
    19
pub struct World {
15295
42b710b0f883 add gear allocator
alfadur
parents: 15291
diff changeset
    20
    allocator: GearAllocator,
15401
6e3e5be8b2e2 update hwphysics motion to use the new system
alfadur
parents: 15374
diff changeset
    21
    data: GearDataManager,
14199
a4c17cfaa4c9 split hwphysics into modules
alfadur
parents: 14165
diff changeset
    22
    physics: PhysicsProcessor,
a4c17cfaa4c9 split hwphysics into modules
alfadur
parents: 14165
diff changeset
    23
    collision: CollisionProcessor,
15291
7446258fab98 add time events
alfadur
parents: 15287
diff changeset
    24
    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
    25
}
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
impl World {
14200
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
    28
    pub fn new(world_size: Size) -> Self {
15401
6e3e5be8b2e2 update hwphysics motion to use the new system
alfadur
parents: 15374
diff changeset
    29
        let mut data = GearDataManager::new();
6e3e5be8b2e2 update hwphysics motion to use the new system
alfadur
parents: 15374
diff changeset
    30
        PhysicsProcessor::register_components(&mut data);
6e3e5be8b2e2 update hwphysics motion to use the new system
alfadur
parents: 15374
diff changeset
    31
        CollisionProcessor::register_components(&mut data);
6e3e5be8b2e2 update hwphysics motion to use the new system
alfadur
parents: 15374
diff changeset
    32
14200
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
    33
        Self {
15401
6e3e5be8b2e2 update hwphysics motion to use the new system
alfadur
parents: 15374
diff changeset
    34
            data,
15295
42b710b0f883 add gear allocator
alfadur
parents: 15291
diff changeset
    35
            allocator: GearAllocator::new(),
14200
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
    36
            physics: PhysicsProcessor::new(),
14737
8e74d4eb89f5 add random falling stuff
alfadur
parents: 14200
diff changeset
    37
            collision: CollisionProcessor::new(world_size),
15291
7446258fab98 add time events
alfadur
parents: 15287
diff changeset
    38
            time: TimeProcessor::new(),
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
15295
42b710b0f883 add gear allocator
alfadur
parents: 15291
diff changeset
    42
    #[inline]
42b710b0f883 add gear allocator
alfadur
parents: 15291
diff changeset
    43
    pub fn new_gear(&mut self) -> Option<GearId> {
42b710b0f883 add gear allocator
alfadur
parents: 15291
diff changeset
    44
        self.allocator.alloc()
42b710b0f883 add gear allocator
alfadur
parents: 15291
diff changeset
    45
    }
42b710b0f883 add gear allocator
alfadur
parents: 15291
diff changeset
    46
42b710b0f883 add gear allocator
alfadur
parents: 15291
diff changeset
    47
    #[inline]
42b710b0f883 add gear allocator
alfadur
parents: 15291
diff changeset
    48
    pub fn delete_gear(&mut self, gear_id: GearId) {
15401
6e3e5be8b2e2 update hwphysics motion to use the new system
alfadur
parents: 15374
diff changeset
    49
        self.data.remove_all(gear_id);
15295
42b710b0f883 add gear allocator
alfadur
parents: 15291
diff changeset
    50
        self.collision.remove(gear_id);
42b710b0f883 add gear allocator
alfadur
parents: 15291
diff changeset
    51
        self.time.cancel(gear_id);
42b710b0f883 add gear allocator
alfadur
parents: 15291
diff changeset
    52
        self.allocator.free(gear_id)
42b710b0f883 add gear allocator
alfadur
parents: 15291
diff changeset
    53
    }
42b710b0f883 add gear allocator
alfadur
parents: 15291
diff changeset
    54
15296
66c987015f2d replace time with milliseconds
alfadur
parents: 15295
diff changeset
    55
    pub fn step(&mut self, time_step: Millis, land: &Land2D<u32>) {
15404
701ad89a9f2a avoid time multiplication when not skipping ticks
alfadur
parents: 15402
diff changeset
    56
        let updates = if time_step == Millis::new(1) {
701ad89a9f2a avoid time multiplication when not skipping ticks
alfadur
parents: 15402
diff changeset
    57
            self.physics.process_single_tick(&mut self.data)
701ad89a9f2a avoid time multiplication when not skipping ticks
alfadur
parents: 15402
diff changeset
    58
        } else {
701ad89a9f2a avoid time multiplication when not skipping ticks
alfadur
parents: 15402
diff changeset
    59
            self.physics
701ad89a9f2a avoid time multiplication when not skipping ticks
alfadur
parents: 15402
diff changeset
    60
                .process_multiple_ticks(&mut self.data, time_step)
701ad89a9f2a avoid time multiplication when not skipping ticks
alfadur
parents: 15402
diff changeset
    61
        };
15401
6e3e5be8b2e2 update hwphysics motion to use the new system
alfadur
parents: 15374
diff changeset
    62
        let collisions = self.collision.process(land, &updates);
15291
7446258fab98 add time events
alfadur
parents: 15287
diff changeset
    63
        let events = self.time.process(time_step);
14165
165e43c3ed59 pull land into collision detector
alfadur
parents: 14080
diff changeset
    64
    }
165e43c3ed59 pull land into collision detector
alfadur
parents: 14080
diff changeset
    65
15401
6e3e5be8b2e2 update hwphysics motion to use the new system
alfadur
parents: 15374
diff changeset
    66
    #[inline]
6e3e5be8b2e2 update hwphysics motion to use the new system
alfadur
parents: 15374
diff changeset
    67
    pub fn add_gear_data<T: Clone + 'static>(&mut self, gear_id: GearId, data: &T) {
6e3e5be8b2e2 update hwphysics motion to use the new system
alfadur
parents: 15374
diff changeset
    68
        self.data.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
    69
    }
15784
84c07aa94b61 start drawing gears
alfadur
parents: 15404
diff changeset
    70
84c07aa94b61 start drawing gears
alfadur
parents: 15404
diff changeset
    71
    #[inline]
84c07aa94b61 start drawing gears
alfadur
parents: 15404
diff changeset
    72
    pub fn iter_data<T: TypeIter + 'static>(&mut self) -> DataIterator<T> {
84c07aa94b61 start drawing gears
alfadur
parents: 15404
diff changeset
    73
        self.data.iter()
84c07aa94b61 start drawing gears
alfadur
parents: 15404
diff changeset
    74
    }
14080
c6745a1c827a start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
diff changeset
    75
}
c6745a1c827a start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
diff changeset
    76
c6745a1c827a start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
diff changeset
    77
#[cfg(test)]
c6745a1c827a start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
diff changeset
    78
mod tests {
14200
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
    79
    use crate::{
14737
8e74d4eb89f5 add random falling stuff
alfadur
parents: 14200
diff changeset
    80
        collision::{CircleBounds, CollisionData},
15374
35c331f9308e fix world test
alfadur
parents: 15326
diff changeset
    81
        common::Millis,
15401
6e3e5be8b2e2 update hwphysics motion to use the new system
alfadur
parents: 15374
diff changeset
    82
        physics::{PositionData, VelocityData},
14737
8e74d4eb89f5 add random falling stuff
alfadur
parents: 14200
diff changeset
    83
        World,
14200
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
    84
    };
14737
8e74d4eb89f5 add random falling stuff
alfadur
parents: 14200
diff changeset
    85
    use fpnum::{fp, FPNum, FPPoint};
14200
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
    86
    use integral_geometry::Size;
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
    87
    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
    88
14200
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
    89
    #[test]
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
    90
    fn data_flow() {
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
    91
        let world_size = Size::new(2048, 2048);
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
    92
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
    93
        let mut world = World::new(world_size);
15401
6e3e5be8b2e2 update hwphysics motion to use the new system
alfadur
parents: 15374
diff changeset
    94
        let gear_id = world.new_gear().unwrap();
6e3e5be8b2e2 update hwphysics motion to use the new system
alfadur
parents: 15374
diff changeset
    95
6e3e5be8b2e2 update hwphysics motion to use the new system
alfadur
parents: 15374
diff changeset
    96
        world.add_gear_data(gear_id, &PositionData(FPPoint::zero()));
6e3e5be8b2e2 update hwphysics motion to use the new system
alfadur
parents: 15374
diff changeset
    97
        world.add_gear_data(gear_id, &VelocityData(FPPoint::unit_y()));
14200
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
    98
14737
8e74d4eb89f5 add random falling stuff
alfadur
parents: 14200
diff changeset
    99
        world.add_gear_data(
8e74d4eb89f5 add random falling stuff
alfadur
parents: 14200
diff changeset
   100
            gear_id,
15401
6e3e5be8b2e2 update hwphysics motion to use the new system
alfadur
parents: 15374
diff changeset
   101
            &CollisionData {
14737
8e74d4eb89f5 add random falling stuff
alfadur
parents: 14200
diff changeset
   102
                bounds: CircleBounds {
8e74d4eb89f5 add random falling stuff
alfadur
parents: 14200
diff changeset
   103
                    center: FPPoint::zero(),
8e74d4eb89f5 add random falling stuff
alfadur
parents: 14200
diff changeset
   104
                    radius: fp!(10),
8e74d4eb89f5 add random falling stuff
alfadur
parents: 14200
diff changeset
   105
                },
8e74d4eb89f5 add random falling stuff
alfadur
parents: 14200
diff changeset
   106
            },
8e74d4eb89f5 add random falling stuff
alfadur
parents: 14200
diff changeset
   107
        );
14200
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
   108
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
   109
        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
   110
15374
35c331f9308e fix world test
alfadur
parents: 15326
diff changeset
   111
        world.step(Millis::new(1), &land);
14200
abbb74b9cb62 generalize adding data to World
alfadur
parents: 14199
diff changeset
   112
    }
14080
c6745a1c827a start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents:
diff changeset
   113
}