rust/integral-geometry/src/lib.rs
author alfadur
Mon, 05 Nov 2018 19:53:26 +0300
changeset 14131 c416d32764b7
parent 14126 32383b888309
child 14133 a65b60f36b96
permissions -rw-r--r--
organize landgen a bit more
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
14081
5d42204ac35e Start convertion of FindPoint()
unC0Rr
parents: 14078
diff changeset
     1
extern crate fpnum;
5d42204ac35e Start convertion of FindPoint()
unC0Rr
parents: 14078
diff changeset
     2
5d42204ac35e Start convertion of FindPoint()
unC0Rr
parents: 14078
diff changeset
     3
use fpnum::distance;
14125
376a0551b00a - Add distance-divider option to land_dump
unc0rr
parents: 14124
diff changeset
     4
use std::cmp::max;
14131
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
     5
use std::ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Range, RangeInclusive, Sub, SubAssign};
13938
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
     6
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
     7
#[derive(PartialEq, Eq, Clone, Copy, Debug)]
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
     8
pub struct Point {
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
     9
    pub x: i32,
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
    10
    pub y: i32,
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
    11
}
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
    12
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
    13
impl Point {
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
    14
    #[inline]
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
    15
    pub fn new(x: i32, y: i32) -> Self {
13941
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
    16
        Self { x, y }
13938
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
    17
    }
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
    18
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
    19
    #[inline]
14131
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
    20
    pub fn diag(v: i32) -> Self {
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
    21
        Self::new(v, v)
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
    22
    }
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
    23
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
    24
    #[inline]
13938
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
    25
    pub fn zero() -> Self {
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
    26
        Self::new(0, 0)
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
    27
    }
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
    28
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
    29
    #[inline]
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
    30
    pub fn signum(self) -> Self {
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
    31
        Self::new(self.x.signum(), self.y.signum())
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
    32
    }
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
    33
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
    34
    #[inline]
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
    35
    pub fn abs(self) -> Self {
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
    36
        Self::new(self.x.abs(), self.y.abs())
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
    37
    }
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
    38
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
    39
    #[inline]
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
    40
    pub fn dot(self, other: Point) -> i32 {
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
    41
        self.x * other.x + self.y * other.y
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
    42
    }
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
    43
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
    44
    #[inline]
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
    45
    pub fn max_norm(self) -> i32 {
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
    46
        std::cmp::max(self.x.abs(), self.y.abs())
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
    47
    }
14031
c47283feafac add circle filling to land2d
alfadur
parents: 13950
diff changeset
    48
c47283feafac add circle filling to land2d
alfadur
parents: 13950
diff changeset
    49
    #[inline]
14081
5d42204ac35e Start convertion of FindPoint()
unC0Rr
parents: 14078
diff changeset
    50
    pub fn integral_norm(self) -> u32 {
5d42204ac35e Start convertion of FindPoint()
unC0Rr
parents: 14078
diff changeset
    51
        distance(self.x, self.y).abs_round()
5d42204ac35e Start convertion of FindPoint()
unC0Rr
parents: 14078
diff changeset
    52
    }
5d42204ac35e Start convertion of FindPoint()
unC0Rr
parents: 14078
diff changeset
    53
5d42204ac35e Start convertion of FindPoint()
unC0Rr
parents: 14078
diff changeset
    54
    #[inline]
14031
c47283feafac add circle filling to land2d
alfadur
parents: 13950
diff changeset
    55
    pub fn transform(self, matrix: &[i32; 4]) -> Self {
14076
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
    56
        Point::new(
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
    57
            matrix[0] * self.x + matrix[1] * self.y,
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
    58
            matrix[2] * self.x + matrix[3] * self.y,
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
    59
        )
14031
c47283feafac add circle filling to land2d
alfadur
parents: 13950
diff changeset
    60
    }
14106
5c1ce63114a5 a bit of simplification
alfadur
parents: 14096
diff changeset
    61
5c1ce63114a5 a bit of simplification
alfadur
parents: 14096
diff changeset
    62
    #[inline]
5c1ce63114a5 a bit of simplification
alfadur
parents: 14096
diff changeset
    63
    pub fn rotate90(self) -> Self {
14107
6a3bcb7c2981 swap coordinate system
alfadur
parents: 14106
diff changeset
    64
        Point::new(self.y, -self.x)
14106
5c1ce63114a5 a bit of simplification
alfadur
parents: 14096
diff changeset
    65
    }
14108
36b792842d5b a bit more simplification
alfadur
parents: 14107
diff changeset
    66
36b792842d5b a bit more simplification
alfadur
parents: 14107
diff changeset
    67
    #[inline]
36b792842d5b a bit more simplification
alfadur
parents: 14107
diff changeset
    68
    pub fn cross(self, other: Point) -> i32 {
36b792842d5b a bit more simplification
alfadur
parents: 14107
diff changeset
    69
        self.dot(other.rotate90())
36b792842d5b a bit more simplification
alfadur
parents: 14107
diff changeset
    70
    }
14125
376a0551b00a - Add distance-divider option to land_dump
unc0rr
parents: 14124
diff changeset
    71
376a0551b00a - Add distance-divider option to land_dump
unc0rr
parents: 14124
diff changeset
    72
    #[inline]
14131
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
    73
    pub fn clamp(self, rect: &Rect) -> Point {
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
    74
        Point::new(
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
    75
            rect.x_range().clamp(self.x),
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
    76
            rect.y_range().clamp(self.y)
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
    77
        )
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
    78
    }
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
    79
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
    80
    #[inline]
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
    81
    pub fn line_to(self, end: Point) -> Line {
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
    82
        Line::new(self, end)
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
    83
    }
14125
376a0551b00a - Add distance-divider option to land_dump
unc0rr
parents: 14124
diff changeset
    84
14131
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
    85
    #[inline]
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
    86
    pub fn ray_to(self, end: Point) -> Ray {
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
    87
        self.line_to(end).to_ray()
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
    88
    }
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
    89
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
    90
    #[inline]
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
    91
    pub fn tangent(self) -> i32 {
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
    92
        self.y / self.x
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
    93
    }
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
    94
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
    95
    #[inline]
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
    96
    pub fn cotangent(self) -> i32 {
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
    97
        self.x / self.y
14125
376a0551b00a - Add distance-divider option to land_dump
unc0rr
parents: 14124
diff changeset
    98
    }
13938
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
    99
}
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   100
14032
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   101
#[derive(PartialEq, Eq, Clone, Copy, Debug)]
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   102
pub struct Size {
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   103
    pub width: usize,
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   104
    pub height: usize,
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   105
}
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   106
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   107
impl Size {
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   108
    #[inline]
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   109
    pub fn new(width: usize, height: usize) -> Self {
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   110
        Size { width, height }
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   111
    }
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   112
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   113
    #[inline]
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   114
    pub fn square(size: usize) -> Self {
14076
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
   115
        Size {
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
   116
            width: size,
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
   117
            height: size,
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
   118
        }
14032
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   119
    }
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   120
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   121
    #[inline]
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   122
    pub fn area(&self) -> usize {
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   123
        self.width * self.height
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   124
    }
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   125
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   126
    #[inline]
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   127
    pub fn linear_index(&self, x: usize, y: usize) -> usize {
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   128
        y * self.width + x
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   129
    }
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   130
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   131
    #[inline]
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   132
    pub fn is_power_of_two(&self) -> bool {
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   133
        self.width.is_power_of_two() && self.height.is_power_of_two()
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   134
    }
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   135
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   136
    #[inline]
14052
alfadur
parents: 14051 14032
diff changeset
   137
    pub fn next_power_of_two(&self) -> Self {
alfadur
parents: 14051 14032
diff changeset
   138
        Self {
alfadur
parents: 14051 14032
diff changeset
   139
            width: self.width.next_power_of_two(),
14076
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
   140
            height: self.height.next_power_of_two(),
14052
alfadur
parents: 14051 14032
diff changeset
   141
        }
alfadur
parents: 14051 14032
diff changeset
   142
    }
alfadur
parents: 14051 14032
diff changeset
   143
alfadur
parents: 14051 14032
diff changeset
   144
    #[inline]
14032
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   145
    pub fn to_mask(&self) -> SizeMask {
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   146
        SizeMask::new(*self)
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   147
    }
14059
c6745a1c827a start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents: 14054
diff changeset
   148
14125
376a0551b00a - Add distance-divider option to land_dump
unc0rr
parents: 14124
diff changeset
   149
    #[inline]
376a0551b00a - Add distance-divider option to land_dump
unc0rr
parents: 14124
diff changeset
   150
    pub fn to_square(&self) -> Size {
376a0551b00a - Add distance-divider option to land_dump
unc0rr
parents: 14124
diff changeset
   151
        Size::square(max(self.width, self.height))
376a0551b00a - Add distance-divider option to land_dump
unc0rr
parents: 14124
diff changeset
   152
    }
376a0551b00a - Add distance-divider option to land_dump
unc0rr
parents: 14124
diff changeset
   153
14059
c6745a1c827a start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents: 14054
diff changeset
   154
    pub fn to_grid_index(&self) -> GridIndex {
c6745a1c827a start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents: 14054
diff changeset
   155
        GridIndex::new(*self)
c6745a1c827a start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents: 14054
diff changeset
   156
    }
14032
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   157
}
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   158
14076
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
   159
pub struct SizeMask {
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
   160
    size: Size,
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
   161
}
14032
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   162
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   163
impl SizeMask {
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   164
    #[inline]
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   165
    pub fn new(size: Size) -> Self {
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   166
        assert!(size.is_power_of_two());
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   167
        let size = Size {
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   168
            width: !(size.width - 1),
14076
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
   169
            height: !(size.height - 1),
14032
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   170
        };
14059
c6745a1c827a start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents: 14054
diff changeset
   171
        Self { size }
14032
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   172
    }
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   173
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   174
    #[inline]
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   175
    pub fn contains_x<T: Into<usize>>(&self, x: T) -> bool {
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   176
        (self.size.width & x.into()) == 0
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   177
    }
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   178
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   179
    #[inline]
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   180
    pub fn contains_y<T: Into<usize>>(&self, y: T) -> bool {
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   181
        (self.size.height & y.into()) == 0
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   182
    }
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   183
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   184
    #[inline]
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   185
    pub fn contains(&self, point: Point) -> bool {
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   186
        self.contains_x(point.x as usize) && self.contains_y(point.y as usize)
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14031
diff changeset
   187
    }
13938
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   188
}
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   189
14076
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
   190
pub struct GridIndex {
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
   191
    shift: Point,
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
   192
}
14059
c6745a1c827a start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents: 14054
diff changeset
   193
c6745a1c827a start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents: 14054
diff changeset
   194
impl GridIndex {
c6745a1c827a start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents: 14054
diff changeset
   195
    pub fn new(size: Size) -> Self {
c6745a1c827a start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents: 14054
diff changeset
   196
        assert!(size.is_power_of_two());
14076
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
   197
        let shift = Point::new(
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
   198
            size.width.trailing_zeros() as i32,
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
   199
            size.height.trailing_zeros() as i32,
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
   200
        );
14059
c6745a1c827a start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents: 14054
diff changeset
   201
        Self { shift }
c6745a1c827a start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents: 14054
diff changeset
   202
    }
c6745a1c827a start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents: 14054
diff changeset
   203
c6745a1c827a start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents: 14054
diff changeset
   204
    pub fn map(&self, position: Point) -> Point {
14076
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
   205
        Point::new(position.x >> self.shift.x, position.y >> self.shift.y)
14059
c6745a1c827a start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents: 14054
diff changeset
   206
    }
c6745a1c827a start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents: 14054
diff changeset
   207
}
c6745a1c827a start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents: 14054
diff changeset
   208
13938
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   209
macro_rules! bin_op_impl {
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   210
    ($op: ty, $name: tt) => {
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   211
        impl $op for Point {
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   212
            type Output = Self;
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   213
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   214
            #[inline]
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   215
            fn $name(self, rhs: Self) -> Self::Output {
13941
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   216
                Self::new(self.x.$name(rhs.x), self.y.$name(rhs.y))
13938
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   217
            }
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   218
        }
13941
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   219
    };
13938
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   220
}
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   221
14088
f483f844da98 component-wise division is actually useful sometimes
alfadur
parents: 14081
diff changeset
   222
macro_rules! scalar_bin_op_impl {
f483f844da98 component-wise division is actually useful sometimes
alfadur
parents: 14081
diff changeset
   223
    ($($op: tt)::+, $name: tt) => {
f483f844da98 component-wise division is actually useful sometimes
alfadur
parents: 14081
diff changeset
   224
        impl $($op)::+<i32> for Point {
f483f844da98 component-wise division is actually useful sometimes
alfadur
parents: 14081
diff changeset
   225
            type Output = Self;
f483f844da98 component-wise division is actually useful sometimes
alfadur
parents: 14081
diff changeset
   226
f483f844da98 component-wise division is actually useful sometimes
alfadur
parents: 14081
diff changeset
   227
            #[inline]
f483f844da98 component-wise division is actually useful sometimes
alfadur
parents: 14081
diff changeset
   228
            fn $name(self, rhs: i32) -> Self::Output {
f483f844da98 component-wise division is actually useful sometimes
alfadur
parents: 14081
diff changeset
   229
                Self::new(self.x.$name(rhs), self.y.$name(rhs))
f483f844da98 component-wise division is actually useful sometimes
alfadur
parents: 14081
diff changeset
   230
            }
f483f844da98 component-wise division is actually useful sometimes
alfadur
parents: 14081
diff changeset
   231
        }
f483f844da98 component-wise division is actually useful sometimes
alfadur
parents: 14081
diff changeset
   232
    };
f483f844da98 component-wise division is actually useful sometimes
alfadur
parents: 14081
diff changeset
   233
}
f483f844da98 component-wise division is actually useful sometimes
alfadur
parents: 14081
diff changeset
   234
13938
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   235
macro_rules! bin_assign_op_impl {
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   236
    ($op: ty, $name: tt) => {
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   237
        impl $op for Point {
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   238
            #[inline]
13941
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   239
            fn $name(&mut self, rhs: Self) {
13938
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   240
                self.x.$name(rhs.x);
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   241
                self.y.$name(rhs.y);
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   242
            }
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   243
        }
13941
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   244
    };
13938
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   245
}
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   246
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   247
bin_op_impl!(Add, add);
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   248
bin_op_impl!(Sub, sub);
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   249
bin_op_impl!(Mul, mul);
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   250
bin_op_impl!(Div, div);
14088
f483f844da98 component-wise division is actually useful sometimes
alfadur
parents: 14081
diff changeset
   251
scalar_bin_op_impl!(Mul, mul);
f483f844da98 component-wise division is actually useful sometimes
alfadur
parents: 14081
diff changeset
   252
scalar_bin_op_impl!(Div, div);
13938
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   253
bin_assign_op_impl!(AddAssign, add_assign);
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   254
bin_assign_op_impl!(SubAssign, sub_assign);
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   255
bin_assign_op_impl!(MulAssign, mul_assign);
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   256
bin_assign_op_impl!(DivAssign, div_assign);
13935
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   257
14051
8a0d69c16cad Implement OutlinePoints for land generators, some ground work for template based landgen
unc0rr
parents: 13950
diff changeset
   258
#[derive(PartialEq, Eq, Clone, Copy, Debug)]
8a0d69c16cad Implement OutlinePoints for land generators, some ground work for template based landgen
unc0rr
parents: 13950
diff changeset
   259
pub struct Rect {
8a0d69c16cad Implement OutlinePoints for land generators, some ground work for template based landgen
unc0rr
parents: 13950
diff changeset
   260
    pub x: i32,
8a0d69c16cad Implement OutlinePoints for land generators, some ground work for template based landgen
unc0rr
parents: 13950
diff changeset
   261
    pub y: i32,
8a0d69c16cad Implement OutlinePoints for land generators, some ground work for template based landgen
unc0rr
parents: 13950
diff changeset
   262
    pub width: u32,
8a0d69c16cad Implement OutlinePoints for land generators, some ground work for template based landgen
unc0rr
parents: 13950
diff changeset
   263
    pub height: u32,
8a0d69c16cad Implement OutlinePoints for land generators, some ground work for template based landgen
unc0rr
parents: 13950
diff changeset
   264
}
8a0d69c16cad Implement OutlinePoints for land generators, some ground work for template based landgen
unc0rr
parents: 13950
diff changeset
   265
8a0d69c16cad Implement OutlinePoints for land generators, some ground work for template based landgen
unc0rr
parents: 13950
diff changeset
   266
impl Rect {
8a0d69c16cad Implement OutlinePoints for land generators, some ground work for template based landgen
unc0rr
parents: 13950
diff changeset
   267
    #[inline]
8a0d69c16cad Implement OutlinePoints for land generators, some ground work for template based landgen
unc0rr
parents: 13950
diff changeset
   268
    pub fn new(x: i32, y: i32, width: u32, height: u32) -> Self {
14076
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
   269
        Self {
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
   270
            x,
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
   271
            y,
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
   272
            width,
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
   273
            height,
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
   274
        }
14051
8a0d69c16cad Implement OutlinePoints for land generators, some ground work for template based landgen
unc0rr
parents: 13950
diff changeset
   275
    }
14054
3185fb34f3b5 update theme editor to use new land generator implementation
alfadur
parents: 14052
diff changeset
   276
14078
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   277
    pub fn from_box(left: i32, right: i32, top: i32, bottom: i32) -> Self {
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   278
        assert!(left <= right);
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   279
        assert!(top <= bottom);
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   280
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   281
        Rect::new(left, top, (right - left) as u32, (bottom - top) as u32)
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   282
    }
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   283
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   284
    pub fn from_size(top_left: Point, size: Size) -> Self {
14081
5d42204ac35e Start convertion of FindPoint()
unC0Rr
parents: 14078
diff changeset
   285
        Rect::new(
5d42204ac35e Start convertion of FindPoint()
unC0Rr
parents: 14078
diff changeset
   286
            top_left.x,
5d42204ac35e Start convertion of FindPoint()
unC0Rr
parents: 14078
diff changeset
   287
            top_left.y,
5d42204ac35e Start convertion of FindPoint()
unC0Rr
parents: 14078
diff changeset
   288
            size.width as u32,
5d42204ac35e Start convertion of FindPoint()
unC0Rr
parents: 14078
diff changeset
   289
            size.height as u32,
5d42204ac35e Start convertion of FindPoint()
unC0Rr
parents: 14078
diff changeset
   290
        )
14078
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   291
    }
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   292
14096
133f648c5fbd add some more rectangle convenience methods
alfadur
parents: 14094
diff changeset
   293
    pub fn at_origin(size: Size) -> Self {
133f648c5fbd add some more rectangle convenience methods
alfadur
parents: 14094
diff changeset
   294
        Rect::from_size(Point::zero(), size)
133f648c5fbd add some more rectangle convenience methods
alfadur
parents: 14094
diff changeset
   295
    }
133f648c5fbd add some more rectangle convenience methods
alfadur
parents: 14094
diff changeset
   296
14054
3185fb34f3b5 update theme editor to use new land generator implementation
alfadur
parents: 14052
diff changeset
   297
    #[inline]
3185fb34f3b5 update theme editor to use new land generator implementation
alfadur
parents: 14052
diff changeset
   298
    pub fn size(&self) -> Size {
3185fb34f3b5 update theme editor to use new land generator implementation
alfadur
parents: 14052
diff changeset
   299
        Size::new(self.width as usize, self.height as usize)
3185fb34f3b5 update theme editor to use new land generator implementation
alfadur
parents: 14052
diff changeset
   300
    }
3185fb34f3b5 update theme editor to use new land generator implementation
alfadur
parents: 14052
diff changeset
   301
3185fb34f3b5 update theme editor to use new land generator implementation
alfadur
parents: 14052
diff changeset
   302
    #[inline]
3185fb34f3b5 update theme editor to use new land generator implementation
alfadur
parents: 14052
diff changeset
   303
    pub fn area(&self) -> usize {
3185fb34f3b5 update theme editor to use new land generator implementation
alfadur
parents: 14052
diff changeset
   304
        self.size().area()
3185fb34f3b5 update theme editor to use new land generator implementation
alfadur
parents: 14052
diff changeset
   305
    }
14078
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   306
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   307
    #[inline]
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   308
    pub fn left(&self) -> i32 {
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   309
        self.x
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   310
    }
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   311
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   312
    #[inline]
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   313
    pub fn top(&self) -> i32 {
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   314
        self.y
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   315
    }
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   316
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   317
    #[inline]
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   318
    pub fn right(&self) -> i32 {
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   319
        self.x + self.width as i32
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   320
    }
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   321
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   322
    #[inline]
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   323
    pub fn bottom(&self) -> i32 {
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   324
        self.y + self.height as i32
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   325
    }
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   326
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   327
    #[inline]
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   328
    pub fn top_left(&self) -> Point {
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   329
        Point::new(self.x, self.y)
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   330
    }
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   331
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   332
    #[inline]
14096
133f648c5fbd add some more rectangle convenience methods
alfadur
parents: 14094
diff changeset
   333
    pub fn bottom_right(&self) -> Point {
133f648c5fbd add some more rectangle convenience methods
alfadur
parents: 14094
diff changeset
   334
        Point::new(self.right(), self.bottom())
133f648c5fbd add some more rectangle convenience methods
alfadur
parents: 14094
diff changeset
   335
    }
133f648c5fbd add some more rectangle convenience methods
alfadur
parents: 14094
diff changeset
   336
133f648c5fbd add some more rectangle convenience methods
alfadur
parents: 14094
diff changeset
   337
    #[inline]
133f648c5fbd add some more rectangle convenience methods
alfadur
parents: 14094
diff changeset
   338
    pub fn center(&self) -> Point {
133f648c5fbd add some more rectangle convenience methods
alfadur
parents: 14094
diff changeset
   339
        (self.top_left() + self.bottom_right()) / 2
133f648c5fbd add some more rectangle convenience methods
alfadur
parents: 14094
diff changeset
   340
    }
133f648c5fbd add some more rectangle convenience methods
alfadur
parents: 14094
diff changeset
   341
133f648c5fbd add some more rectangle convenience methods
alfadur
parents: 14094
diff changeset
   342
    #[inline]
14078
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   343
    pub fn with_margin(&self, margin: i32) -> Self {
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   344
        Rect::from_box(
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   345
            self.left() + margin,
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   346
            self.right() - margin,
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   347
            self.top() + margin,
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   348
            self.bottom() - margin,
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   349
        )
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   350
    }
14081
5d42204ac35e Start convertion of FindPoint()
unC0Rr
parents: 14078
diff changeset
   351
5d42204ac35e Start convertion of FindPoint()
unC0Rr
parents: 14078
diff changeset
   352
    #[inline]
14092
32a34bf70f65 add more rectangle methods
alfadur
parents: 14088
diff changeset
   353
    pub fn x_range(&self) -> RangeInclusive<i32> {
32a34bf70f65 add more rectangle methods
alfadur
parents: 14088
diff changeset
   354
        self.x..=self.x + self.width as i32
32a34bf70f65 add more rectangle methods
alfadur
parents: 14088
diff changeset
   355
    }
32a34bf70f65 add more rectangle methods
alfadur
parents: 14088
diff changeset
   356
32a34bf70f65 add more rectangle methods
alfadur
parents: 14088
diff changeset
   357
    #[inline]
32a34bf70f65 add more rectangle methods
alfadur
parents: 14088
diff changeset
   358
    pub fn y_range(&self) -> RangeInclusive<i32> {
32a34bf70f65 add more rectangle methods
alfadur
parents: 14088
diff changeset
   359
        self.y..=self.y + self.height as i32
32a34bf70f65 add more rectangle methods
alfadur
parents: 14088
diff changeset
   360
    }
32a34bf70f65 add more rectangle methods
alfadur
parents: 14088
diff changeset
   361
32a34bf70f65 add more rectangle methods
alfadur
parents: 14088
diff changeset
   362
    #[inline]
32a34bf70f65 add more rectangle methods
alfadur
parents: 14088
diff changeset
   363
    pub fn contains(&self, point: Point) -> bool {
14131
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   364
        self.x_range().contains(point.x) && self.y_range().contains(point.y)
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   365
    }
14092
32a34bf70f65 add more rectangle methods
alfadur
parents: 14088
diff changeset
   366
32a34bf70f65 add more rectangle methods
alfadur
parents: 14088
diff changeset
   367
    #[inline]
14081
5d42204ac35e Start convertion of FindPoint()
unC0Rr
parents: 14078
diff changeset
   368
    pub fn contains_inside(&self, point: Point) -> bool {
5d42204ac35e Start convertion of FindPoint()
unC0Rr
parents: 14078
diff changeset
   369
        point.x > self.left()
5d42204ac35e Start convertion of FindPoint()
unC0Rr
parents: 14078
diff changeset
   370
            && point.x < self.right()
5d42204ac35e Start convertion of FindPoint()
unC0Rr
parents: 14078
diff changeset
   371
            && point.y > self.top()
5d42204ac35e Start convertion of FindPoint()
unC0Rr
parents: 14078
diff changeset
   372
            && point.y < self.bottom()
5d42204ac35e Start convertion of FindPoint()
unC0Rr
parents: 14078
diff changeset
   373
    }
14092
32a34bf70f65 add more rectangle methods
alfadur
parents: 14088
diff changeset
   374
32a34bf70f65 add more rectangle methods
alfadur
parents: 14088
diff changeset
   375
    #[inline]
32a34bf70f65 add more rectangle methods
alfadur
parents: 14088
diff changeset
   376
    pub fn intersects(&self, other: &Rect) -> bool {
32a34bf70f65 add more rectangle methods
alfadur
parents: 14088
diff changeset
   377
        self.left() <= self.right()
32a34bf70f65 add more rectangle methods
alfadur
parents: 14088
diff changeset
   378
            && self.right() >= other.left()
32a34bf70f65 add more rectangle methods
alfadur
parents: 14088
diff changeset
   379
            && self.top() <= other.bottom()
32a34bf70f65 add more rectangle methods
alfadur
parents: 14088
diff changeset
   380
            && self.bottom() >= other.top()
32a34bf70f65 add more rectangle methods
alfadur
parents: 14088
diff changeset
   381
    }
14096
133f648c5fbd add some more rectangle convenience methods
alfadur
parents: 14094
diff changeset
   382
133f648c5fbd add some more rectangle convenience methods
alfadur
parents: 14094
diff changeset
   383
    #[inline]
133f648c5fbd add some more rectangle convenience methods
alfadur
parents: 14094
diff changeset
   384
    pub fn split_at(&self, point: Point) -> [Rect; 4] {
133f648c5fbd add some more rectangle convenience methods
alfadur
parents: 14094
diff changeset
   385
        assert!(self.contains_inside(point));
133f648c5fbd add some more rectangle convenience methods
alfadur
parents: 14094
diff changeset
   386
        [
133f648c5fbd add some more rectangle convenience methods
alfadur
parents: 14094
diff changeset
   387
            Rect::from_box(self.left(), point.x, self.top(), point.y),
133f648c5fbd add some more rectangle convenience methods
alfadur
parents: 14094
diff changeset
   388
            Rect::from_box(point.x, self.right(), self.top(), point.y),
14112
f04bc39f0c05 reorder split rectangles
alfadur
parents: 14108
diff changeset
   389
            Rect::from_box(point.x, self.right(), point.y, self.bottom()),
14125
376a0551b00a - Add distance-divider option to land_dump
unc0rr
parents: 14124
diff changeset
   390
            Rect::from_box(self.left(), point.x, point.y, self.bottom()),
14096
133f648c5fbd add some more rectangle convenience methods
alfadur
parents: 14094
diff changeset
   391
        ]
133f648c5fbd add some more rectangle convenience methods
alfadur
parents: 14094
diff changeset
   392
    }
14131
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   393
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   394
    #[inline]
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   395
    pub fn quotient(self, x: u32, y: u32) -> Point {
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   396
        self.top_left() +
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   397
            Point::new(
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   398
                (x % self.width) as i32,
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   399
                (y % self.height) as i32
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   400
            )
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   401
    }
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   402
}
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   403
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   404
trait RangeContains<T> {
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   405
    fn contains(&self, value: T) -> bool;
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   406
}
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   407
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   408
impl <T: Ord> RangeContains<T> for Range<T> {
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   409
    fn contains(&self, value: T) -> bool {
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   410
        value >= self.start && value < self.end
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   411
    }
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   412
}
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   413
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   414
impl <T: Ord> RangeContains<T> for RangeInclusive<T> {
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   415
    fn contains(&self, value: T) -> bool {
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   416
        value >= *self.start() && value <= *self.end()
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   417
    }
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   418
}
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   419
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   420
trait RangeClamp<T> {
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   421
    fn clamp(&self, value: T) -> T;
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   422
}
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   423
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   424
impl <T: Ord + Copy> RangeClamp<T> for RangeInclusive<T> {
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   425
    fn clamp(&self, value: T) -> T {
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   426
        if value < *self.start() {
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   427
            *self.start()
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   428
        } else if value > *self.end() {
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   429
            *self.end()
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   430
        } else {
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   431
            value
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   432
        }
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   433
    }
14051
8a0d69c16cad Implement OutlinePoints for land generators, some ground work for template based landgen
unc0rr
parents: 13950
diff changeset
   434
}
8a0d69c16cad Implement OutlinePoints for land generators, some ground work for template based landgen
unc0rr
parents: 13950
diff changeset
   435
14094
d0b0d61b7d5e add polygons
alfadur
parents: 14092
diff changeset
   436
pub struct Polygon {
14125
376a0551b00a - Add distance-divider option to land_dump
unc0rr
parents: 14124
diff changeset
   437
    vertices: Vec<Point>,
14094
d0b0d61b7d5e add polygons
alfadur
parents: 14092
diff changeset
   438
}
d0b0d61b7d5e add polygons
alfadur
parents: 14092
diff changeset
   439
d0b0d61b7d5e add polygons
alfadur
parents: 14092
diff changeset
   440
impl Polygon {
d0b0d61b7d5e add polygons
alfadur
parents: 14092
diff changeset
   441
    pub fn new(vertices: &[Point]) -> Self {
d0b0d61b7d5e add polygons
alfadur
parents: 14092
diff changeset
   442
        let mut v = Vec::with_capacity(vertices.len() + 1);
d0b0d61b7d5e add polygons
alfadur
parents: 14092
diff changeset
   443
        v.extend_from_slice(vertices);
d0b0d61b7d5e add polygons
alfadur
parents: 14092
diff changeset
   444
        if !v.is_empty() {
d0b0d61b7d5e add polygons
alfadur
parents: 14092
diff changeset
   445
            let start = v[0];
d0b0d61b7d5e add polygons
alfadur
parents: 14092
diff changeset
   446
            v.push(start);
d0b0d61b7d5e add polygons
alfadur
parents: 14092
diff changeset
   447
        }
d0b0d61b7d5e add polygons
alfadur
parents: 14092
diff changeset
   448
        Self { vertices: v }
d0b0d61b7d5e add polygons
alfadur
parents: 14092
diff changeset
   449
    }
d0b0d61b7d5e add polygons
alfadur
parents: 14092
diff changeset
   450
d0b0d61b7d5e add polygons
alfadur
parents: 14092
diff changeset
   451
    pub fn edges_count(&self) -> usize {
d0b0d61b7d5e add polygons
alfadur
parents: 14092
diff changeset
   452
        self.vertices.len() - 1
d0b0d61b7d5e add polygons
alfadur
parents: 14092
diff changeset
   453
    }
d0b0d61b7d5e add polygons
alfadur
parents: 14092
diff changeset
   454
d0b0d61b7d5e add polygons
alfadur
parents: 14092
diff changeset
   455
    pub fn get_edge(&self, index: usize) -> Line {
d0b0d61b7d5e add polygons
alfadur
parents: 14092
diff changeset
   456
        Line::new(self.vertices[index], self.vertices[index + 1])
d0b0d61b7d5e add polygons
alfadur
parents: 14092
diff changeset
   457
    }
d0b0d61b7d5e add polygons
alfadur
parents: 14092
diff changeset
   458
14124
6e0be42d0a8f polygonize OutlinePoints
alfadur
parents: 14112
diff changeset
   459
    pub fn split_edge(&mut self, edge_index: usize, vertex: Point) {
6e0be42d0a8f polygonize OutlinePoints
alfadur
parents: 14112
diff changeset
   460
        self.vertices.insert(edge_index + 1, vertex);
6e0be42d0a8f polygonize OutlinePoints
alfadur
parents: 14112
diff changeset
   461
    }
6e0be42d0a8f polygonize OutlinePoints
alfadur
parents: 14112
diff changeset
   462
6e0be42d0a8f polygonize OutlinePoints
alfadur
parents: 14112
diff changeset
   463
    pub fn iter<'a>(&'a self) -> impl Iterator<Item = &Point> + 'a {
6e0be42d0a8f polygonize OutlinePoints
alfadur
parents: 14112
diff changeset
   464
        (&self.vertices[..self.edges_count()]).iter()
6e0be42d0a8f polygonize OutlinePoints
alfadur
parents: 14112
diff changeset
   465
    }
6e0be42d0a8f polygonize OutlinePoints
alfadur
parents: 14112
diff changeset
   466
6e0be42d0a8f polygonize OutlinePoints
alfadur
parents: 14112
diff changeset
   467
    pub fn iter_mut<'a>(&'a mut self) -> impl Iterator<Item = &mut Point> + 'a {
6e0be42d0a8f polygonize OutlinePoints
alfadur
parents: 14112
diff changeset
   468
        let edges_count = self.edges_count();
6e0be42d0a8f polygonize OutlinePoints
alfadur
parents: 14112
diff changeset
   469
        (&mut self.vertices[..edges_count]).iter_mut()
14094
d0b0d61b7d5e add polygons
alfadur
parents: 14092
diff changeset
   470
    }
d0b0d61b7d5e add polygons
alfadur
parents: 14092
diff changeset
   471
d0b0d61b7d5e add polygons
alfadur
parents: 14092
diff changeset
   472
    pub fn iter_edges<'a>(&'a self) -> impl Iterator<Item = Line> + 'a {
d0b0d61b7d5e add polygons
alfadur
parents: 14092
diff changeset
   473
        (&self.vertices[0..self.edges_count()])
d0b0d61b7d5e add polygons
alfadur
parents: 14092
diff changeset
   474
            .iter()
d0b0d61b7d5e add polygons
alfadur
parents: 14092
diff changeset
   475
            .zip(&self.vertices[1..])
d0b0d61b7d5e add polygons
alfadur
parents: 14092
diff changeset
   476
            .map(|(s, e)| Line::new(*s, *e))
d0b0d61b7d5e add polygons
alfadur
parents: 14092
diff changeset
   477
    }
d0b0d61b7d5e add polygons
alfadur
parents: 14092
diff changeset
   478
}
d0b0d61b7d5e add polygons
alfadur
parents: 14092
diff changeset
   479
d0b0d61b7d5e add polygons
alfadur
parents: 14092
diff changeset
   480
impl From<Vec<Point>> for Polygon {
d0b0d61b7d5e add polygons
alfadur
parents: 14092
diff changeset
   481
    fn from(mut v: Vec<Point>) -> Self {
d0b0d61b7d5e add polygons
alfadur
parents: 14092
diff changeset
   482
        if !v.is_empty() && v[0] != v[v.len() - 1] {
d0b0d61b7d5e add polygons
alfadur
parents: 14092
diff changeset
   483
            let start = v[0];
d0b0d61b7d5e add polygons
alfadur
parents: 14092
diff changeset
   484
            v.push(start)
d0b0d61b7d5e add polygons
alfadur
parents: 14092
diff changeset
   485
        }
d0b0d61b7d5e add polygons
alfadur
parents: 14092
diff changeset
   486
        Self { vertices: v }
d0b0d61b7d5e add polygons
alfadur
parents: 14092
diff changeset
   487
    }
d0b0d61b7d5e add polygons
alfadur
parents: 14092
diff changeset
   488
}
d0b0d61b7d5e add polygons
alfadur
parents: 14092
diff changeset
   489
14076
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
   490
#[derive(PartialEq, Eq, Clone, Copy, Debug)]
14131
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   491
pub struct Ray {
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   492
    pub start: Point,
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   493
    pub direction: Point
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   494
}
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   495
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   496
impl Ray {
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   497
    #[inline]
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   498
    pub fn new(start: Point, direction: Point) -> Ray {
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   499
        Self { start, direction }
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   500
    }
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   501
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   502
    #[inline]
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   503
    pub fn tangent(&self) -> i32 {
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   504
        self.direction.tangent()
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   505
    }
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   506
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   507
    #[inline]
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   508
    pub fn cotangent(&self) -> i32 {
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   509
        self.direction.cotangent()
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   510
    }
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   511
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   512
    #[inline]
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   513
    pub fn orientation(&self, point: Point) -> i32 {
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   514
        (point - self.start).cross(self.direction).signum()
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   515
    }
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   516
}
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   517
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   518
#[derive(PartialEq, Eq, Clone, Copy, Debug)]
14076
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
   519
pub struct Line {
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
   520
    pub start: Point,
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
   521
    pub end: Point,
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
   522
}
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
   523
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
   524
impl Line {
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
   525
    #[inline]
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
   526
    pub fn new(start: Point, end: Point) -> Self {
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
   527
        Self { start, end }
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
   528
    }
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
   529
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
   530
    #[inline]
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
   531
    pub fn zero() -> Self {
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
   532
        Self::new(Point::zero(), Point::zero())
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
   533
    }
14077
5ade484f3351 Refactor tests, add fn center() for Line
unC0Rr
parents: 14076
diff changeset
   534
5ade484f3351 Refactor tests, add fn center() for Line
unC0Rr
parents: 14076
diff changeset
   535
    #[inline]
5ade484f3351 Refactor tests, add fn center() for Line
unC0Rr
parents: 14076
diff changeset
   536
    pub fn center(&self) -> Point {
14088
f483f844da98 component-wise division is actually useful sometimes
alfadur
parents: 14081
diff changeset
   537
        (self.start + self.end) / 2
14077
5ade484f3351 Refactor tests, add fn center() for Line
unC0Rr
parents: 14076
diff changeset
   538
    }
14106
5c1ce63114a5 a bit of simplification
alfadur
parents: 14096
diff changeset
   539
5c1ce63114a5 a bit of simplification
alfadur
parents: 14096
diff changeset
   540
    #[inline]
14131
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   541
    pub fn scaled_direction(&self) -> Point {
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   542
        self.end - self.start
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   543
    }
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   544
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   545
    #[inline]
14106
5c1ce63114a5 a bit of simplification
alfadur
parents: 14096
diff changeset
   546
    pub fn scaled_normal(&self) -> Point {
14131
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   547
        self.scaled_direction().rotate90()
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   548
    }
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   549
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   550
    #[inline]
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   551
    pub fn to_ray(&self) -> Ray {
c416d32764b7 organize landgen a bit more
alfadur
parents: 14126
diff changeset
   552
        Ray::new(self.start, self.scaled_direction())
14106
5c1ce63114a5 a bit of simplification
alfadur
parents: 14096
diff changeset
   553
    }
14076
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
   554
}
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
   555
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
   556
impl IntoIterator for Line {
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
   557
    type Item = Point;
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
   558
    type IntoIter = LinePoints;
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
   559
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
   560
    fn into_iter(self) -> Self::IntoIter {
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
   561
        LinePoints::new(self)
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
   562
    }
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
   563
}
14051
8a0d69c16cad Implement OutlinePoints for land generators, some ground work for template based landgen
unc0rr
parents: 13950
diff changeset
   564
13935
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   565
pub struct LinePoints {
13938
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   566
    accumulator: Point,
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   567
    direction: Point,
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   568
    sign: Point,
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   569
    current: Point,
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   570
    total_steps: i32,
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   571
    step: i32,
13935
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   572
}
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   573
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   574
impl LinePoints {
14076
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
   575
    pub fn new(line: Line) -> Self {
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
   576
        let dir = line.end - line.start;
13935
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   577
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   578
        Self {
13938
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   579
            accumulator: Point::zero(),
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   580
            direction: dir.abs(),
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   581
            sign: dir.signum(),
14076
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14059
diff changeset
   582
            current: line.start,
13938
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   583
            total_steps: dir.max_norm(),
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   584
            step: 0,
13935
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   585
        }
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   586
    }
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   587
}
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   588
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   589
impl Iterator for LinePoints {
13938
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   590
    type Item = Point;
13935
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   591
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   592
    fn next(&mut self) -> Option<Self::Item> {
13938
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   593
        if self.step <= self.total_steps {
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   594
            self.accumulator += self.direction;
13935
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   595
13938
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   596
            if self.accumulator.x > self.total_steps {
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   597
                self.accumulator.x -= self.total_steps;
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   598
                self.current.x += self.sign.x;
13935
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   599
            }
13938
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   600
            if self.accumulator.y > self.total_steps {
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   601
                self.accumulator.y -= self.total_steps;
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   602
                self.current.y += self.sign.y;
13935
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   603
            }
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   604
13938
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   605
            self.step += 1;
13935
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   606
13938
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   607
            Some(self.current)
13935
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   608
        } else {
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   609
            None
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   610
        }
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   611
    }
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   612
}
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   613
13941
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   614
pub struct ArcPoints {
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   615
    point: Point,
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   616
    step: i32,
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   617
}
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   618
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   619
impl ArcPoints {
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   620
    pub fn new(radius: i32) -> Self {
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   621
        Self {
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   622
            point: Point::new(0, radius),
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   623
            step: 3 - 2 * radius,
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   624
        }
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   625
    }
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   626
}
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   627
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   628
impl Iterator for ArcPoints {
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   629
    type Item = Point;
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   630
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   631
    fn next(&mut self) -> Option<Self::Item> {
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   632
        if self.point.x < self.point.y {
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   633
            let result = self.point;
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   634
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   635
            if self.step < 0 {
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   636
                self.step += self.point.x * 4 + 6;
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   637
            } else {
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   638
                self.step += (self.point.x - self.point.y) * 4 + 10;
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   639
                self.point.y -= 1;
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   640
            }
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   641
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   642
            self.point.x += 1;
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   643
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   644
            Some(result)
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   645
        } else if self.point.x == self.point.y {
13947
85645992bc8a Fix ArcPoints never finishing
unc0rr
parents: 13943
diff changeset
   646
            self.point.x += 1;
13950
48796bef9e69 Add --protocol option to engine
unc0rr
parents: 13947
diff changeset
   647
13941
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   648
            Some(self.point)
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   649
        } else {
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   650
            None
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   651
        }
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   652
    }
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   653
}
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   654
13942
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13941
diff changeset
   655
pub struct EquidistantPoints {
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13941
diff changeset
   656
    vector: Point,
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13941
diff changeset
   657
    iteration: u8,
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13941
diff changeset
   658
}
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13941
diff changeset
   659
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13941
diff changeset
   660
impl EquidistantPoints {
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13941
diff changeset
   661
    pub fn new(vector: Point) -> Self {
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13941
diff changeset
   662
        Self {
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13941
diff changeset
   663
            vector,
13943
a325ed57ebfe Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents: 13942
diff changeset
   664
            iteration: if vector.x == vector.y { 4 } else { 8 },
13942
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13941
diff changeset
   665
        }
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13941
diff changeset
   666
    }
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13941
diff changeset
   667
}
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13941
diff changeset
   668
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13941
diff changeset
   669
impl Iterator for EquidistantPoints {
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13941
diff changeset
   670
    type Item = Point;
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13941
diff changeset
   671
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13941
diff changeset
   672
    fn next(&mut self) -> Option<Self::Item> {
13943
a325ed57ebfe Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents: 13942
diff changeset
   673
        if self.iteration > 0 {
13942
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13941
diff changeset
   674
            self.vector.x = -self.vector.x;
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13941
diff changeset
   675
            if self.iteration & 1 == 0 {
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13941
diff changeset
   676
                self.vector.y = -self.vector.y;
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13941
diff changeset
   677
            }
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13941
diff changeset
   678
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13941
diff changeset
   679
            if self.iteration == 4 {
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13941
diff changeset
   680
                std::mem::swap(&mut self.vector.x, &mut self.vector.y);
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13941
diff changeset
   681
            }
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13941
diff changeset
   682
13943
a325ed57ebfe Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents: 13942
diff changeset
   683
            self.iteration -= 1;
13942
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13941
diff changeset
   684
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13941
diff changeset
   685
            Some(self.vector)
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13941
diff changeset
   686
        } else {
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13941
diff changeset
   687
            None
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13941
diff changeset
   688
        }
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13941
diff changeset
   689
    }
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13941
diff changeset
   690
}
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13941
diff changeset
   691
13935
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   692
#[cfg(test)]
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   693
mod tests {
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   694
    use super::*;
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   695
13938
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   696
    fn get_points(coords: &[(i32, i32)]) -> Vec<Point> {
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   697
        coords.iter().map(|(x, y)| Point::new(*x, *y)).collect()
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   698
    }
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   699
13935
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   700
    #[test]
13942
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13941
diff changeset
   701
    fn line_basic() {
14077
5ade484f3351 Refactor tests, add fn center() for Line
unC0Rr
parents: 14076
diff changeset
   702
        let line: Vec<Point> = Line::new(Point::new(0, 0), Point::new(3, 3))
5ade484f3351 Refactor tests, add fn center() for Line
unC0Rr
parents: 14076
diff changeset
   703
            .into_iter()
5ade484f3351 Refactor tests, add fn center() for Line
unC0Rr
parents: 14076
diff changeset
   704
            .collect();
5ade484f3351 Refactor tests, add fn center() for Line
unC0Rr
parents: 14076
diff changeset
   705
        let v = get_points(&[(0, 0), (1, 1), (2, 2), (3, 3)]);
13935
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   706
14077
5ade484f3351 Refactor tests, add fn center() for Line
unC0Rr
parents: 14076
diff changeset
   707
        assert_eq!(line, v);
13938
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   708
    }
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   709
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   710
    #[test]
13942
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13941
diff changeset
   711
    fn line_skewed() {
14077
5ade484f3351 Refactor tests, add fn center() for Line
unC0Rr
parents: 14076
diff changeset
   712
        let line: Vec<Point> = Line::new(Point::new(0, 0), Point::new(5, -7))
5ade484f3351 Refactor tests, add fn center() for Line
unC0Rr
parents: 14076
diff changeset
   713
            .into_iter()
5ade484f3351 Refactor tests, add fn center() for Line
unC0Rr
parents: 14076
diff changeset
   714
            .collect();
13941
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   715
        let v = get_points(&[
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   716
            (0, 0),
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   717
            (1, -1),
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   718
            (2, -2),
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   719
            (2, -3),
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   720
            (3, -4),
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   721
            (4, -5),
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   722
            (4, -6),
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   723
            (5, -7),
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13938
diff changeset
   724
        ]);
13938
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13937
diff changeset
   725
14077
5ade484f3351 Refactor tests, add fn center() for Line
unC0Rr
parents: 14076
diff changeset
   726
        assert_eq!(line, v);
13935
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   727
    }
13942
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13941
diff changeset
   728
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13941
diff changeset
   729
    #[test]
13943
a325ed57ebfe Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents: 13942
diff changeset
   730
    fn equidistant_full() {
14077
5ade484f3351 Refactor tests, add fn center() for Line
unC0Rr
parents: 14076
diff changeset
   731
        let n: Vec<Point> = EquidistantPoints::new(Point::new(1, 3)).collect();
13942
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13941
diff changeset
   732
        let v = get_points(&[
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13941
diff changeset
   733
            (-1, -3),
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13941
diff changeset
   734
            (1, -3),
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13941
diff changeset
   735
            (-1, 3),
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13941
diff changeset
   736
            (1, 3),
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13941
diff changeset
   737
            (-3, -1),
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13941
diff changeset
   738
            (3, -1),
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13941
diff changeset
   739
            (-3, 1),
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13941
diff changeset
   740
            (3, 1),
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13941
diff changeset
   741
        ]);
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13941
diff changeset
   742
14077
5ade484f3351 Refactor tests, add fn center() for Line
unC0Rr
parents: 14076
diff changeset
   743
        assert_eq!(n, v);
13942
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13941
diff changeset
   744
    }
13943
a325ed57ebfe Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents: 13942
diff changeset
   745
a325ed57ebfe Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents: 13942
diff changeset
   746
    #[test]
a325ed57ebfe Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents: 13942
diff changeset
   747
    fn equidistant_half() {
14077
5ade484f3351 Refactor tests, add fn center() for Line
unC0Rr
parents: 14076
diff changeset
   748
        let n: Vec<Point> = EquidistantPoints::new(Point::new(2, 2)).collect();
5ade484f3351 Refactor tests, add fn center() for Line
unC0Rr
parents: 14076
diff changeset
   749
        let v = get_points(&[(-2, -2), (2, -2), (-2, 2), (2, 2)]);
5ade484f3351 Refactor tests, add fn center() for Line
unC0Rr
parents: 14076
diff changeset
   750
5ade484f3351 Refactor tests, add fn center() for Line
unC0Rr
parents: 14076
diff changeset
   751
        assert_eq!(n, v);
5ade484f3351 Refactor tests, add fn center() for Line
unC0Rr
parents: 14076
diff changeset
   752
    }
13943
a325ed57ebfe Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents: 13942
diff changeset
   753
14077
5ade484f3351 Refactor tests, add fn center() for Line
unC0Rr
parents: 14076
diff changeset
   754
    #[test]
5ade484f3351 Refactor tests, add fn center() for Line
unC0Rr
parents: 14076
diff changeset
   755
    fn line() {
5ade484f3351 Refactor tests, add fn center() for Line
unC0Rr
parents: 14076
diff changeset
   756
        let l = Line::new(Point::new(1, 1), Point::new(5, 6));
5ade484f3351 Refactor tests, add fn center() for Line
unC0Rr
parents: 14076
diff changeset
   757
5ade484f3351 Refactor tests, add fn center() for Line
unC0Rr
parents: 14076
diff changeset
   758
        assert_eq!(l.center(), Point::new(3, 3));
13943
a325ed57ebfe Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents: 13942
diff changeset
   759
    }
14078
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   760
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   761
    #[test]
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   762
    fn rect() {
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   763
        let r = Rect::from_box(10, 100, 0, 70);
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   764
14081
5d42204ac35e Start convertion of FindPoint()
unC0Rr
parents: 14078
diff changeset
   765
        assert!(r.contains_inside(Point::new(99, 69)));
5d42204ac35e Start convertion of FindPoint()
unC0Rr
parents: 14078
diff changeset
   766
        assert!(!r.contains_inside(Point::new(100, 70)));
5d42204ac35e Start convertion of FindPoint()
unC0Rr
parents: 14078
diff changeset
   767
14078
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   768
        assert_eq!(r.top_left(), Point::new(10, 0));
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   769
        assert_eq!(r.with_margin(12), Rect::from_box(22, 88, 12, 58));
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14077
diff changeset
   770
    }
14125
376a0551b00a - Add distance-divider option to land_dump
unc0rr
parents: 14124
diff changeset
   771
376a0551b00a - Add distance-divider option to land_dump
unc0rr
parents: 14124
diff changeset
   772
    #[test]
376a0551b00a - Add distance-divider option to land_dump
unc0rr
parents: 14124
diff changeset
   773
    fn fit() {
376a0551b00a - Add distance-divider option to land_dump
unc0rr
parents: 14124
diff changeset
   774
        let r = Rect::from_box(10, 100, 0, 70);
376a0551b00a - Add distance-divider option to land_dump
unc0rr
parents: 14124
diff changeset
   775
376a0551b00a - Add distance-divider option to land_dump
unc0rr
parents: 14124
diff changeset
   776
        assert_eq!(Point::new(0, -10).fit(&r), Point::new(10, 0));
376a0551b00a - Add distance-divider option to land_dump
unc0rr
parents: 14124
diff changeset
   777
        assert_eq!(Point::new(1000, 1000).fit(&r), Point::new(100, 70));
376a0551b00a - Add distance-divider option to land_dump
unc0rr
parents: 14124
diff changeset
   778
    }
13935
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   779
}