rust/integral-geometry/src/lib.rs
author nemo
Wed, 21 Nov 2018 11:59:20 -0500
changeset 14267 72e9d69a5e4d
parent 14213 87f1054c2333
child 14632 2e2b31cf0871
permissions -rw-r--r--
silence warning
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
14212
bb2f301d4fe0 2018ize everything
alfadur
parents: 14180
diff changeset
     1
use fpnum::{distance, FPNum, FPPoint, fp};
14139
09f62bb046ef actually there is a way to preserve mutable polygon iterator
alfadur
parents: 14138
diff changeset
     2
use std::{
14145
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
     3
    cmp::{max, min},
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
     4
    ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Range, RangeInclusive, Sub, SubAssign},
14139
09f62bb046ef actually there is a way to preserve mutable polygon iterator
alfadur
parents: 14138
diff changeset
     5
};
09f62bb046ef actually there is a way to preserve mutable polygon iterator
alfadur
parents: 14138
diff changeset
     6
13943
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
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: 13942
diff changeset
     8
pub struct Point {
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
     9
    pub x: i32,
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    10
    pub y: i32,
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    11
}
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    12
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    13
impl Point {
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    14
    #[inline]
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    15
    pub fn new(x: i32, y: i32) -> Self {
13946
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
    16
        Self { x, y }
13943
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    17
    }
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    18
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    19
    #[inline]
14136
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
    20
    pub fn diag(v: i32) -> Self {
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
    21
        Self::new(v, v)
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
    22
    }
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
    23
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
    24
    #[inline]
13943
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    25
    pub fn zero() -> Self {
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    26
        Self::new(0, 0)
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    27
    }
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    28
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    29
    #[inline]
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    30
    pub fn signum(self) -> Self {
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
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: 13942
diff changeset
    32
    }
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    33
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    34
    #[inline]
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    35
    pub fn abs(self) -> Self {
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
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: 13942
diff changeset
    37
    }
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    38
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    39
    #[inline]
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
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: 13942
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: 13942
diff changeset
    42
    }
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    43
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
    44
    #[inline]
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
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: 13942
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: 13942
diff changeset
    47
    }
14036
c47283feafac add circle filling to land2d
alfadur
parents: 13955
diff changeset
    48
c47283feafac add circle filling to land2d
alfadur
parents: 13955
diff changeset
    49
    #[inline]
14086
5d42204ac35e Start convertion of FindPoint()
unC0Rr
parents: 14083
diff changeset
    50
    pub fn integral_norm(self) -> u32 {
5d42204ac35e Start convertion of FindPoint()
unC0Rr
parents: 14083
diff changeset
    51
        distance(self.x, self.y).abs_round()
5d42204ac35e Start convertion of FindPoint()
unC0Rr
parents: 14083
diff changeset
    52
    }
5d42204ac35e Start convertion of FindPoint()
unC0Rr
parents: 14083
diff changeset
    53
5d42204ac35e Start convertion of FindPoint()
unC0Rr
parents: 14083
diff changeset
    54
    #[inline]
14036
c47283feafac add circle filling to land2d
alfadur
parents: 13955
diff changeset
    55
    pub fn transform(self, matrix: &[i32; 4]) -> Self {
14081
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14064
diff changeset
    56
        Point::new(
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14064
diff changeset
    57
            matrix[0] * self.x + matrix[1] * self.y,
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14064
diff changeset
    58
            matrix[2] * self.x + matrix[3] * self.y,
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14064
diff changeset
    59
        )
14036
c47283feafac add circle filling to land2d
alfadur
parents: 13955
diff changeset
    60
    }
14111
5c1ce63114a5 a bit of simplification
alfadur
parents: 14101
diff changeset
    61
5c1ce63114a5 a bit of simplification
alfadur
parents: 14101
diff changeset
    62
    #[inline]
5c1ce63114a5 a bit of simplification
alfadur
parents: 14101
diff changeset
    63
    pub fn rotate90(self) -> Self {
14112
6a3bcb7c2981 swap coordinate system
alfadur
parents: 14111
diff changeset
    64
        Point::new(self.y, -self.x)
14111
5c1ce63114a5 a bit of simplification
alfadur
parents: 14101
diff changeset
    65
    }
14113
36b792842d5b a bit more simplification
alfadur
parents: 14112
diff changeset
    66
36b792842d5b a bit more simplification
alfadur
parents: 14112
diff changeset
    67
    #[inline]
36b792842d5b a bit more simplification
alfadur
parents: 14112
diff changeset
    68
    pub fn cross(self, other: Point) -> i32 {
36b792842d5b a bit more simplification
alfadur
parents: 14112
diff changeset
    69
        self.dot(other.rotate90())
36b792842d5b a bit more simplification
alfadur
parents: 14112
diff changeset
    70
    }
14130
376a0551b00a - Add distance-divider option to land_dump
unc0rr
parents: 14129
diff changeset
    71
376a0551b00a - Add distance-divider option to land_dump
unc0rr
parents: 14129
diff changeset
    72
    #[inline]
14142
3119d665d3c6 collapse rectangle types back together with consistent usage of size
alfadur
parents: 14140
diff changeset
    73
    pub fn clamp(self, rect: &Rect) -> Point {
14145
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
    74
        Point::new(rect.x_range().clamp(self.x), rect.y_range().clamp(self.y))
14136
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
    75
    }
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
    76
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
    77
    #[inline]
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
    78
    pub fn line_to(self, end: Point) -> Line {
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
    79
        Line::new(self, end)
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
    80
    }
14130
376a0551b00a - Add distance-divider option to land_dump
unc0rr
parents: 14129
diff changeset
    81
14136
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
    82
    #[inline]
14146
477faa7b8a48 fix ray construction
alfadur
parents: 14145
diff changeset
    83
    pub fn ray_with_dir(self, direction: Point) -> Ray {
477faa7b8a48 fix ray construction
alfadur
parents: 14145
diff changeset
    84
        Ray::new(self, direction)
14136
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
    85
    }
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
    86
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
    87
    #[inline]
14147
11202097584f fix tangents
alfadur
parents: 14146
diff changeset
    88
    pub fn tangent_mul(self, x: i32) -> i32 {
11202097584f fix tangents
alfadur
parents: 14146
diff changeset
    89
        x * self.y / self.x
14136
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
    90
    }
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
    91
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
    92
    #[inline]
14147
11202097584f fix tangents
alfadur
parents: 14146
diff changeset
    93
    pub fn cotangent_mul(self, y: i32) -> i32 {
11202097584f fix tangents
alfadur
parents: 14146
diff changeset
    94
        y * self.x / self.y
14130
376a0551b00a - Add distance-divider option to land_dump
unc0rr
parents: 14129
diff changeset
    95
    }
14144
37c99587825d Implement BeizerCurveSegments, no tests
unc0rr
parents: 14142
diff changeset
    96
37c99587825d Implement BeizerCurveSegments, no tests
unc0rr
parents: 14142
diff changeset
    97
    #[inline]
14149
165e43c3ed59 pull land into collision detector
alfadur
parents: 14147
diff changeset
    98
    pub fn to_fppoint(self) -> FPPoint {
14144
37c99587825d Implement BeizerCurveSegments, no tests
unc0rr
parents: 14142
diff changeset
    99
        FPPoint::new(self.x.into(), self.y.into())
37c99587825d Implement BeizerCurveSegments, no tests
unc0rr
parents: 14142
diff changeset
   100
    }
14149
165e43c3ed59 pull land into collision detector
alfadur
parents: 14147
diff changeset
   101
165e43c3ed59 pull land into collision detector
alfadur
parents: 14147
diff changeset
   102
    #[inline]
165e43c3ed59 pull land into collision detector
alfadur
parents: 14147
diff changeset
   103
    pub fn from_fppoint(p: &FPPoint) -> Self {
165e43c3ed59 pull land into collision detector
alfadur
parents: 14147
diff changeset
   104
        Self::new(p.x().round(), p.y().round())
165e43c3ed59 pull land into collision detector
alfadur
parents: 14147
diff changeset
   105
    }
13943
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   106
}
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   107
14037
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   108
#[derive(PartialEq, Eq, Clone, Copy, Debug)]
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   109
pub struct Size {
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   110
    pub width: usize,
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   111
    pub height: usize,
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   112
}
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   113
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   114
impl Size {
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   115
    #[inline]
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   116
    pub fn new(width: usize, height: usize) -> Self {
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   117
        Size { width, height }
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   118
    }
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   119
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   120
    #[inline]
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   121
    pub fn square(size: usize) -> Self {
14081
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14064
diff changeset
   122
        Size {
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14064
diff changeset
   123
            width: size,
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14064
diff changeset
   124
            height: size,
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14064
diff changeset
   125
        }
14037
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   126
    }
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   127
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   128
    #[inline]
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   129
    pub fn area(&self) -> usize {
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   130
        self.width * self.height
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   131
    }
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   132
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   133
    #[inline]
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   134
    pub fn linear_index(&self, x: usize, y: usize) -> usize {
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   135
        y * self.width + x
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   136
    }
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   137
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   138
    #[inline]
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   139
    pub fn is_power_of_two(&self) -> bool {
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   140
        self.width.is_power_of_two() && self.height.is_power_of_two()
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   141
    }
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   142
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   143
    #[inline]
14057
alfadur
parents: 14056 14037
diff changeset
   144
    pub fn next_power_of_two(&self) -> Self {
alfadur
parents: 14056 14037
diff changeset
   145
        Self {
alfadur
parents: 14056 14037
diff changeset
   146
            width: self.width.next_power_of_two(),
14081
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14064
diff changeset
   147
            height: self.height.next_power_of_two(),
14057
alfadur
parents: 14056 14037
diff changeset
   148
        }
alfadur
parents: 14056 14037
diff changeset
   149
    }
alfadur
parents: 14056 14037
diff changeset
   150
alfadur
parents: 14056 14037
diff changeset
   151
    #[inline]
14180
76a52e8149e3 add some texture transforms
alfadur
parents: 14160
diff changeset
   152
    pub fn transpose(&self) -> Self {
76a52e8149e3 add some texture transforms
alfadur
parents: 14160
diff changeset
   153
        Self::new(self.height, self.width)
76a52e8149e3 add some texture transforms
alfadur
parents: 14160
diff changeset
   154
    }
76a52e8149e3 add some texture transforms
alfadur
parents: 14160
diff changeset
   155
76a52e8149e3 add some texture transforms
alfadur
parents: 14160
diff changeset
   156
    #[inline]
14037
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   157
    pub fn to_mask(&self) -> SizeMask {
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   158
        SizeMask::new(*self)
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   159
    }
14064
c6745a1c827a start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents: 14059
diff changeset
   160
14130
376a0551b00a - Add distance-divider option to land_dump
unc0rr
parents: 14129
diff changeset
   161
    #[inline]
376a0551b00a - Add distance-divider option to land_dump
unc0rr
parents: 14129
diff changeset
   162
    pub fn to_square(&self) -> Size {
376a0551b00a - Add distance-divider option to land_dump
unc0rr
parents: 14129
diff changeset
   163
        Size::square(max(self.width, self.height))
376a0551b00a - Add distance-divider option to land_dump
unc0rr
parents: 14129
diff changeset
   164
    }
376a0551b00a - Add distance-divider option to land_dump
unc0rr
parents: 14129
diff changeset
   165
14064
c6745a1c827a start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents: 14059
diff changeset
   166
    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: 14059
diff changeset
   167
        GridIndex::new(*self)
c6745a1c827a start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents: 14059
diff changeset
   168
    }
14037
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   169
}
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   170
14153
d3c9025abd13 seems like about 25% speedup in land filling
alfadur
parents: 14151
diff changeset
   171
#[derive(PartialEq, Eq, Clone, Copy, Debug)]
14081
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14064
diff changeset
   172
pub struct SizeMask {
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14064
diff changeset
   173
    size: Size,
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14064
diff changeset
   174
}
14037
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   175
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   176
impl SizeMask {
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   177
    #[inline]
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   178
    pub fn new(size: Size) -> Self {
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   179
        assert!(size.is_power_of_two());
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   180
        let size = Size {
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   181
            width: !(size.width - 1),
14081
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14064
diff changeset
   182
            height: !(size.height - 1),
14037
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   183
        };
14064
c6745a1c827a start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents: 14059
diff changeset
   184
        Self { size }
14037
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   185
    }
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   186
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   187
    #[inline]
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   188
    pub fn contains_x<T: Into<usize>>(&self, x: T) -> bool {
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   189
        (self.size.width & x.into()) == 0
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   190
    }
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   191
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   192
    #[inline]
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   193
    pub fn contains_y<T: Into<usize>>(&self, y: T) -> bool {
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   194
        (self.size.height & y.into()) == 0
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   195
    }
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   196
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   197
    #[inline]
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   198
    pub fn contains(&self, point: Point) -> bool {
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   199
        self.contains_x(point.x as usize) && self.contains_y(point.y as usize)
2869c2ccb1b8 extract size struct for common usage
alfadur
parents: 14036
diff changeset
   200
    }
13943
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   201
}
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   202
14081
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14064
diff changeset
   203
pub struct GridIndex {
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14064
diff changeset
   204
    shift: Point,
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14064
diff changeset
   205
}
14064
c6745a1c827a start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents: 14059
diff changeset
   206
c6745a1c827a start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents: 14059
diff changeset
   207
impl GridIndex {
c6745a1c827a start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents: 14059
diff changeset
   208
    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: 14059
diff changeset
   209
        assert!(size.is_power_of_two());
14081
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14064
diff changeset
   210
        let shift = Point::new(
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14064
diff changeset
   211
            size.width.trailing_zeros() as i32,
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14064
diff changeset
   212
            size.height.trailing_zeros() as i32,
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14064
diff changeset
   213
        );
14064
c6745a1c827a start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents: 14059
diff changeset
   214
        Self { shift }
c6745a1c827a start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents: 14059
diff changeset
   215
    }
c6745a1c827a start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents: 14059
diff changeset
   216
c6745a1c827a start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents: 14059
diff changeset
   217
    pub fn map(&self, position: Point) -> Point {
14081
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14064
diff changeset
   218
        Point::new(position.x >> self.shift.x, position.y >> self.shift.y)
14064
c6745a1c827a start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents: 14059
diff changeset
   219
    }
c6745a1c827a start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents: 14059
diff changeset
   220
}
c6745a1c827a start a physics engine to try out this data oriented thing everyone seems to be talking about
alfadur
parents: 14059
diff changeset
   221
13943
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   222
macro_rules! bin_op_impl {
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   223
    ($op: ty, $name: tt) => {
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   224
        impl $op for Point {
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   225
            type Output = Self;
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   226
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   227
            #[inline]
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   228
            fn $name(self, rhs: Self) -> Self::Output {
13946
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   229
                Self::new(self.x.$name(rhs.x), self.y.$name(rhs.y))
13943
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   230
            }
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   231
        }
13946
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   232
    };
13943
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   233
}
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   234
14093
f483f844da98 component-wise division is actually useful sometimes
alfadur
parents: 14086
diff changeset
   235
macro_rules! scalar_bin_op_impl {
f483f844da98 component-wise division is actually useful sometimes
alfadur
parents: 14086
diff changeset
   236
    ($($op: tt)::+, $name: tt) => {
f483f844da98 component-wise division is actually useful sometimes
alfadur
parents: 14086
diff changeset
   237
        impl $($op)::+<i32> for Point {
f483f844da98 component-wise division is actually useful sometimes
alfadur
parents: 14086
diff changeset
   238
            type Output = Self;
f483f844da98 component-wise division is actually useful sometimes
alfadur
parents: 14086
diff changeset
   239
f483f844da98 component-wise division is actually useful sometimes
alfadur
parents: 14086
diff changeset
   240
            #[inline]
f483f844da98 component-wise division is actually useful sometimes
alfadur
parents: 14086
diff changeset
   241
            fn $name(self, rhs: i32) -> Self::Output {
f483f844da98 component-wise division is actually useful sometimes
alfadur
parents: 14086
diff changeset
   242
                Self::new(self.x.$name(rhs), self.y.$name(rhs))
f483f844da98 component-wise division is actually useful sometimes
alfadur
parents: 14086
diff changeset
   243
            }
f483f844da98 component-wise division is actually useful sometimes
alfadur
parents: 14086
diff changeset
   244
        }
f483f844da98 component-wise division is actually useful sometimes
alfadur
parents: 14086
diff changeset
   245
    };
f483f844da98 component-wise division is actually useful sometimes
alfadur
parents: 14086
diff changeset
   246
}
f483f844da98 component-wise division is actually useful sometimes
alfadur
parents: 14086
diff changeset
   247
13943
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   248
macro_rules! bin_assign_op_impl {
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   249
    ($op: ty, $name: tt) => {
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   250
        impl $op for Point {
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   251
            #[inline]
13946
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   252
            fn $name(&mut self, rhs: Self) {
13943
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   253
                self.x.$name(rhs.x);
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   254
                self.y.$name(rhs.y);
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   255
            }
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   256
        }
13946
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   257
    };
13943
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   258
}
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   259
14151
4791c9a7d5e8 add more point operators
alfadur
parents: 14149
diff changeset
   260
macro_rules! fp_scalar_bin_op_impl {
4791c9a7d5e8 add more point operators
alfadur
parents: 14149
diff changeset
   261
    ($($op: tt)::+, $name: tt) => {
4791c9a7d5e8 add more point operators
alfadur
parents: 14149
diff changeset
   262
        impl $($op)::+<FPNum> for Point {
4791c9a7d5e8 add more point operators
alfadur
parents: 14149
diff changeset
   263
            type Output = FPPoint;
4791c9a7d5e8 add more point operators
alfadur
parents: 14149
diff changeset
   264
4791c9a7d5e8 add more point operators
alfadur
parents: 14149
diff changeset
   265
            #[inline]
4791c9a7d5e8 add more point operators
alfadur
parents: 14149
diff changeset
   266
            fn $name(self, rhs: FPNum) -> Self::Output {
4791c9a7d5e8 add more point operators
alfadur
parents: 14149
diff changeset
   267
                FPPoint::new(rhs.$name(self.x), rhs.$name(self.y))
4791c9a7d5e8 add more point operators
alfadur
parents: 14149
diff changeset
   268
            }
4791c9a7d5e8 add more point operators
alfadur
parents: 14149
diff changeset
   269
        }
4791c9a7d5e8 add more point operators
alfadur
parents: 14149
diff changeset
   270
    };
4791c9a7d5e8 add more point operators
alfadur
parents: 14149
diff changeset
   271
}
4791c9a7d5e8 add more point operators
alfadur
parents: 14149
diff changeset
   272
4791c9a7d5e8 add more point operators
alfadur
parents: 14149
diff changeset
   273
macro_rules! left_fp_scalar_bin_op_impl {
4791c9a7d5e8 add more point operators
alfadur
parents: 14149
diff changeset
   274
    ($($op: tt)::+, $name: tt) => {
4791c9a7d5e8 add more point operators
alfadur
parents: 14149
diff changeset
   275
        impl $($op)::+<Point> for FPNum {
4791c9a7d5e8 add more point operators
alfadur
parents: 14149
diff changeset
   276
            type Output = FPPoint;
4791c9a7d5e8 add more point operators
alfadur
parents: 14149
diff changeset
   277
4791c9a7d5e8 add more point operators
alfadur
parents: 14149
diff changeset
   278
            #[inline]
4791c9a7d5e8 add more point operators
alfadur
parents: 14149
diff changeset
   279
            fn $name(self, rhs: Point) -> Self::Output {
4791c9a7d5e8 add more point operators
alfadur
parents: 14149
diff changeset
   280
                FPPoint::new(self.$name(rhs.x), self.$name(rhs.y))
4791c9a7d5e8 add more point operators
alfadur
parents: 14149
diff changeset
   281
            }
4791c9a7d5e8 add more point operators
alfadur
parents: 14149
diff changeset
   282
        }
4791c9a7d5e8 add more point operators
alfadur
parents: 14149
diff changeset
   283
    };
4791c9a7d5e8 add more point operators
alfadur
parents: 14149
diff changeset
   284
}
4791c9a7d5e8 add more point operators
alfadur
parents: 14149
diff changeset
   285
13943
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   286
bin_op_impl!(Add, add);
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   287
bin_op_impl!(Sub, sub);
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   288
bin_op_impl!(Mul, mul);
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   289
bin_op_impl!(Div, div);
14093
f483f844da98 component-wise division is actually useful sometimes
alfadur
parents: 14086
diff changeset
   290
scalar_bin_op_impl!(Mul, mul);
f483f844da98 component-wise division is actually useful sometimes
alfadur
parents: 14086
diff changeset
   291
scalar_bin_op_impl!(Div, div);
14151
4791c9a7d5e8 add more point operators
alfadur
parents: 14149
diff changeset
   292
fp_scalar_bin_op_impl!(Mul, mul);
4791c9a7d5e8 add more point operators
alfadur
parents: 14149
diff changeset
   293
fp_scalar_bin_op_impl!(Div, div);
4791c9a7d5e8 add more point operators
alfadur
parents: 14149
diff changeset
   294
left_fp_scalar_bin_op_impl!(Mul, mul);
4791c9a7d5e8 add more point operators
alfadur
parents: 14149
diff changeset
   295
left_fp_scalar_bin_op_impl!(Div, div);
13943
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   296
bin_assign_op_impl!(AddAssign, add_assign);
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   297
bin_assign_op_impl!(SubAssign, sub_assign);
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   298
bin_assign_op_impl!(MulAssign, mul_assign);
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   299
bin_assign_op_impl!(DivAssign, div_assign);
13940
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   300
14056
8a0d69c16cad Implement OutlinePoints for land generators, some ground work for template based landgen
unc0rr
parents: 13955
diff changeset
   301
#[derive(PartialEq, Eq, Clone, Copy, Debug)]
8a0d69c16cad Implement OutlinePoints for land generators, some ground work for template based landgen
unc0rr
parents: 13955
diff changeset
   302
pub struct Rect {
14142
3119d665d3c6 collapse rectangle types back together with consistent usage of size
alfadur
parents: 14140
diff changeset
   303
    top_left: Point,
3119d665d3c6 collapse rectangle types back together with consistent usage of size
alfadur
parents: 14140
diff changeset
   304
    bottom_right: Point,
14056
8a0d69c16cad Implement OutlinePoints for land generators, some ground work for template based landgen
unc0rr
parents: 13955
diff changeset
   305
}
8a0d69c16cad Implement OutlinePoints for land generators, some ground work for template based landgen
unc0rr
parents: 13955
diff changeset
   306
8a0d69c16cad Implement OutlinePoints for land generators, some ground work for template based landgen
unc0rr
parents: 13955
diff changeset
   307
impl Rect {
8a0d69c16cad Implement OutlinePoints for land generators, some ground work for template based landgen
unc0rr
parents: 13955
diff changeset
   308
    #[inline]
14140
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   309
    pub fn new(top_left: Point, bottom_right: Point) -> Self {
14142
3119d665d3c6 collapse rectangle types back together with consistent usage of size
alfadur
parents: 14140
diff changeset
   310
        assert!(top_left.x <= bottom_right.x + 1);
3119d665d3c6 collapse rectangle types back together with consistent usage of size
alfadur
parents: 14140
diff changeset
   311
        assert!(top_left.y <= bottom_right.y + 1);
14145
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   312
        Self {
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   313
            top_left,
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   314
            bottom_right,
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   315
        }
14140
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   316
    }
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   317
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   318
    pub fn from_box(left: i32, right: i32, top: i32, bottom: i32) -> Self {
14142
3119d665d3c6 collapse rectangle types back together with consistent usage of size
alfadur
parents: 14140
diff changeset
   319
        Self::new(Point::new(left, top), Point::new(right, bottom))
14140
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   320
    }
14142
3119d665d3c6 collapse rectangle types back together with consistent usage of size
alfadur
parents: 14140
diff changeset
   321
14140
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   322
    pub fn from_size(top_left: Point, size: Size) -> Self {
14142
3119d665d3c6 collapse rectangle types back together with consistent usage of size
alfadur
parents: 14140
diff changeset
   323
        Self::new(
14140
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   324
            top_left,
14145
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   325
            top_left + Point::new(size.width as i32 - 1, size.height as i32 - 1),
14140
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   326
        )
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   327
    }
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   328
14142
3119d665d3c6 collapse rectangle types back together with consistent usage of size
alfadur
parents: 14140
diff changeset
   329
    pub fn from_size_coords(x: i32, y: i32, width: usize, height: usize) -> Self {
3119d665d3c6 collapse rectangle types back together with consistent usage of size
alfadur
parents: 14140
diff changeset
   330
        Self::from_size(Point::new(x, y), Size::new(width, height))
3119d665d3c6 collapse rectangle types back together with consistent usage of size
alfadur
parents: 14140
diff changeset
   331
    }
3119d665d3c6 collapse rectangle types back together with consistent usage of size
alfadur
parents: 14140
diff changeset
   332
14140
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   333
    pub fn at_origin(size: Size) -> Self {
14142
3119d665d3c6 collapse rectangle types back together with consistent usage of size
alfadur
parents: 14140
diff changeset
   334
        Self::from_size(Point::zero(), size)
14140
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   335
    }
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   336
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   337
    #[inline]
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   338
    pub fn width(&self) -> usize {
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   339
        (self.right() - self.left() + 1) as usize
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   340
    }
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   341
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   342
    #[inline]
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   343
    pub fn height(&self) -> usize {
14212
bb2f301d4fe0 2018ize everything
alfadur
parents: 14180
diff changeset
   344
        (self.bottom() - self.top() + 1) as usize
14140
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   345
    }
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   346
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   347
    #[inline]
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   348
    pub fn size(&self) -> Size {
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   349
        Size::new(self.width(), self.height())
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   350
    }
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   351
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   352
    #[inline]
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   353
    pub fn area(&self) -> usize {
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   354
        self.size().area()
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   355
    }
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   356
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   357
    #[inline]
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   358
    pub fn left(&self) -> i32 {
14142
3119d665d3c6 collapse rectangle types back together with consistent usage of size
alfadur
parents: 14140
diff changeset
   359
        self.top_left().x
14140
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   360
    }
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   361
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   362
    #[inline]
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   363
    pub fn top(&self) -> i32 {
14142
3119d665d3c6 collapse rectangle types back together with consistent usage of size
alfadur
parents: 14140
diff changeset
   364
        self.top_left().y
14140
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   365
    }
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   366
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   367
    #[inline]
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   368
    pub fn right(&self) -> i32 {
14142
3119d665d3c6 collapse rectangle types back together with consistent usage of size
alfadur
parents: 14140
diff changeset
   369
        self.bottom_right().x
14140
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   370
    }
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   371
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   372
    #[inline]
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   373
    pub fn bottom(&self) -> i32 {
14142
3119d665d3c6 collapse rectangle types back together with consistent usage of size
alfadur
parents: 14140
diff changeset
   374
        self.bottom_right().y
14140
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   375
    }
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   376
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   377
    #[inline]
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   378
    pub fn top_left(&self) -> Point {
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   379
        self.top_left
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   380
    }
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   381
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   382
    #[inline]
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   383
    pub fn bottom_right(&self) -> Point {
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   384
        self.bottom_right
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   385
    }
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   386
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   387
    #[inline]
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   388
    pub fn center(&self) -> Point {
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   389
        (self.top_left() + self.bottom_right()) / 2
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   390
    }
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   391
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   392
    #[inline]
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   393
    pub fn with_margin(&self, margin: i32) -> Self {
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   394
        let offset = Point::diag(margin);
14145
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   395
        Self::new(self.top_left() + offset, self.bottom_right() - offset)
14140
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   396
    }
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   397
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   398
    #[inline]
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   399
    pub fn x_range(&self) -> RangeInclusive<i32> {
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   400
        self.left()..=self.right()
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   401
    }
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   402
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   403
    #[inline]
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   404
    pub fn y_range(&self) -> RangeInclusive<i32> {
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   405
        self.top()..=self.bottom()
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   406
    }
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   407
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   408
    #[inline]
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   409
    pub fn contains(&self, point: Point) -> bool {
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   410
        self.x_range().contains(point.x) && self.y_range().contains(point.y)
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   411
    }
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   412
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   413
    #[inline]
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   414
    pub fn contains_inside(&self, point: Point) -> bool {
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   415
        point.x > self.left()
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   416
            && point.x < self.right()
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   417
            && point.y > self.top()
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   418
            && point.y < self.bottom()
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   419
    }
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   420
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   421
    #[inline]
14142
3119d665d3c6 collapse rectangle types back together with consistent usage of size
alfadur
parents: 14140
diff changeset
   422
    pub fn intersects(&self, other: &Rect) -> bool {
14140
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   423
        self.left() <= self.right()
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   424
            && self.right() >= other.left()
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   425
            && self.top() <= other.bottom()
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   426
            && self.bottom() >= other.top()
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   427
    }
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   428
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   429
    #[inline]
14142
3119d665d3c6 collapse rectangle types back together with consistent usage of size
alfadur
parents: 14140
diff changeset
   430
    pub fn split_at(&self, point: Point) -> [Rect; 4] {
14140
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   431
        assert!(self.contains_inside(point));
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   432
        [
14142
3119d665d3c6 collapse rectangle types back together with consistent usage of size
alfadur
parents: 14140
diff changeset
   433
            Self::from_box(self.left(), point.x, self.top(), point.y),
3119d665d3c6 collapse rectangle types back together with consistent usage of size
alfadur
parents: 14140
diff changeset
   434
            Self::from_box(point.x, self.right(), self.top(), point.y),
3119d665d3c6 collapse rectangle types back together with consistent usage of size
alfadur
parents: 14140
diff changeset
   435
            Self::from_box(point.x, self.right(), point.y, self.bottom()),
3119d665d3c6 collapse rectangle types back together with consistent usage of size
alfadur
parents: 14140
diff changeset
   436
            Self::from_box(self.left(), point.x, point.y, self.bottom()),
14140
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   437
        ]
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   438
    }
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   439
14142
3119d665d3c6 collapse rectangle types back together with consistent usage of size
alfadur
parents: 14140
diff changeset
   440
    #[inline]
3119d665d3c6 collapse rectangle types back together with consistent usage of size
alfadur
parents: 14140
diff changeset
   441
    pub fn quotient(self, x: usize, y: usize) -> Point {
14145
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   442
        self.top_left() + Point::new((x % self.width()) as i32, (y % self.height()) as i32)
14140
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   443
    }
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   444
}
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   445
14136
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   446
trait RangeContains<T> {
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   447
    fn contains(&self, value: T) -> bool;
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   448
}
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   449
14145
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   450
impl<T: Ord> RangeContains<T> for Range<T> {
14136
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   451
    fn contains(&self, value: T) -> bool {
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   452
        value >= self.start && value < self.end
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   453
    }
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   454
}
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   455
14145
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   456
impl<T: Ord> RangeContains<T> for RangeInclusive<T> {
14136
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   457
    fn contains(&self, value: T) -> bool {
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   458
        value >= *self.start() && value <= *self.end()
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   459
    }
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   460
}
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   461
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   462
trait RangeClamp<T> {
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   463
    fn clamp(&self, value: T) -> T;
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   464
}
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   465
14145
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   466
impl<T: Ord + Copy> RangeClamp<T> for RangeInclusive<T> {
14136
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   467
    fn clamp(&self, value: T) -> T {
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   468
        if value < *self.start() {
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   469
            *self.start()
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   470
        } else if value > *self.end() {
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   471
            *self.end()
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   472
        } else {
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   473
            value
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   474
        }
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   475
    }
14056
8a0d69c16cad Implement OutlinePoints for land generators, some ground work for template based landgen
unc0rr
parents: 13955
diff changeset
   476
}
8a0d69c16cad Implement OutlinePoints for land generators, some ground work for template based landgen
unc0rr
parents: 13955
diff changeset
   477
14099
d0b0d61b7d5e add polygons
alfadur
parents: 14097
diff changeset
   478
pub struct Polygon {
14130
376a0551b00a - Add distance-divider option to land_dump
unc0rr
parents: 14129
diff changeset
   479
    vertices: Vec<Point>,
14099
d0b0d61b7d5e add polygons
alfadur
parents: 14097
diff changeset
   480
}
d0b0d61b7d5e add polygons
alfadur
parents: 14097
diff changeset
   481
d0b0d61b7d5e add polygons
alfadur
parents: 14097
diff changeset
   482
impl Polygon {
d0b0d61b7d5e add polygons
alfadur
parents: 14097
diff changeset
   483
    pub fn new(vertices: &[Point]) -> Self {
d0b0d61b7d5e add polygons
alfadur
parents: 14097
diff changeset
   484
        let mut v = Vec::with_capacity(vertices.len() + 1);
d0b0d61b7d5e add polygons
alfadur
parents: 14097
diff changeset
   485
        v.extend_from_slice(vertices);
d0b0d61b7d5e add polygons
alfadur
parents: 14097
diff changeset
   486
        if !v.is_empty() {
d0b0d61b7d5e add polygons
alfadur
parents: 14097
diff changeset
   487
            let start = v[0];
d0b0d61b7d5e add polygons
alfadur
parents: 14097
diff changeset
   488
            v.push(start);
d0b0d61b7d5e add polygons
alfadur
parents: 14097
diff changeset
   489
        }
d0b0d61b7d5e add polygons
alfadur
parents: 14097
diff changeset
   490
        Self { vertices: v }
d0b0d61b7d5e add polygons
alfadur
parents: 14097
diff changeset
   491
    }
d0b0d61b7d5e add polygons
alfadur
parents: 14097
diff changeset
   492
d0b0d61b7d5e add polygons
alfadur
parents: 14097
diff changeset
   493
    pub fn edges_count(&self) -> usize {
d0b0d61b7d5e add polygons
alfadur
parents: 14097
diff changeset
   494
        self.vertices.len() - 1
d0b0d61b7d5e add polygons
alfadur
parents: 14097
diff changeset
   495
    }
d0b0d61b7d5e add polygons
alfadur
parents: 14097
diff changeset
   496
d0b0d61b7d5e add polygons
alfadur
parents: 14097
diff changeset
   497
    pub fn get_edge(&self, index: usize) -> Line {
d0b0d61b7d5e add polygons
alfadur
parents: 14097
diff changeset
   498
        Line::new(self.vertices[index], self.vertices[index + 1])
d0b0d61b7d5e add polygons
alfadur
parents: 14097
diff changeset
   499
    }
d0b0d61b7d5e add polygons
alfadur
parents: 14097
diff changeset
   500
14129
6e0be42d0a8f polygonize OutlinePoints
alfadur
parents: 14117
diff changeset
   501
    pub fn split_edge(&mut self, edge_index: usize, vertex: Point) {
6e0be42d0a8f polygonize OutlinePoints
alfadur
parents: 14117
diff changeset
   502
        self.vertices.insert(edge_index + 1, vertex);
6e0be42d0a8f polygonize OutlinePoints
alfadur
parents: 14117
diff changeset
   503
    }
6e0be42d0a8f polygonize OutlinePoints
alfadur
parents: 14117
diff changeset
   504
6e0be42d0a8f polygonize OutlinePoints
alfadur
parents: 14117
diff changeset
   505
    pub fn iter<'a>(&'a self) -> impl Iterator<Item = &Point> + 'a {
6e0be42d0a8f polygonize OutlinePoints
alfadur
parents: 14117
diff changeset
   506
        (&self.vertices[..self.edges_count()]).iter()
6e0be42d0a8f polygonize OutlinePoints
alfadur
parents: 14117
diff changeset
   507
    }
6e0be42d0a8f polygonize OutlinePoints
alfadur
parents: 14117
diff changeset
   508
14139
09f62bb046ef actually there is a way to preserve mutable polygon iterator
alfadur
parents: 14138
diff changeset
   509
    pub fn iter_mut<'a>(&'a mut self) -> impl Iterator<Item = &mut Point> + 'a {
14160
8f82d87d223f save edges_count
alfadur
parents: 14157
diff changeset
   510
        let edges_count = self.edges_count();
14139
09f62bb046ef actually there is a way to preserve mutable polygon iterator
alfadur
parents: 14138
diff changeset
   511
        let start = self.vertices.as_mut_ptr();
14160
8f82d87d223f save edges_count
alfadur
parents: 14157
diff changeset
   512
        let end = unsafe { start.add(edges_count) };
14145
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   513
        PolygonPointsIteratorMut {
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   514
            source: self,
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   515
            start,
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   516
            end,
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   517
        }
14099
d0b0d61b7d5e add polygons
alfadur
parents: 14097
diff changeset
   518
    }
d0b0d61b7d5e add polygons
alfadur
parents: 14097
diff changeset
   519
14139
09f62bb046ef actually there is a way to preserve mutable polygon iterator
alfadur
parents: 14138
diff changeset
   520
    fn force_close(&mut self) {
14138
a65b60f36b96 fix polygons getting unclosed on mirroring
alfadur
parents: 14136
diff changeset
   521
        if !self.vertices.is_empty() {
14213
87f1054c2333 fix polygon closure
alfadur
parents: 14212
diff changeset
   522
            let edges_count = self.edges_count();
87f1054c2333 fix polygon closure
alfadur
parents: 14212
diff changeset
   523
            self.vertices[edges_count] = self.vertices[0];
14138
a65b60f36b96 fix polygons getting unclosed on mirroring
alfadur
parents: 14136
diff changeset
   524
        }
a65b60f36b96 fix polygons getting unclosed on mirroring
alfadur
parents: 14136
diff changeset
   525
    }
a65b60f36b96 fix polygons getting unclosed on mirroring
alfadur
parents: 14136
diff changeset
   526
14099
d0b0d61b7d5e add polygons
alfadur
parents: 14097
diff changeset
   527
    pub fn iter_edges<'a>(&'a self) -> impl Iterator<Item = Line> + 'a {
d0b0d61b7d5e add polygons
alfadur
parents: 14097
diff changeset
   528
        (&self.vertices[0..self.edges_count()])
d0b0d61b7d5e add polygons
alfadur
parents: 14097
diff changeset
   529
            .iter()
d0b0d61b7d5e add polygons
alfadur
parents: 14097
diff changeset
   530
            .zip(&self.vertices[1..])
d0b0d61b7d5e add polygons
alfadur
parents: 14097
diff changeset
   531
            .map(|(s, e)| Line::new(*s, *e))
d0b0d61b7d5e add polygons
alfadur
parents: 14097
diff changeset
   532
    }
14145
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   533
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   534
    pub fn bezierize(&mut self, segments_number: u32) {
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   535
        fn calc_point(p1: Point, p2: Point, p3: Point) -> FPPoint {
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   536
            let diff13 = (p1 - p3).to_fppoint();
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   537
            let diff13_norm = diff13.distance();
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   538
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   539
            if diff13_norm.is_zero() {
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   540
                diff13
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   541
            } else {
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   542
                let diff12_norm = (p1 - p2).to_fppoint().distance();
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   543
                let diff23_norm = (p2 - p3).to_fppoint().distance();
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   544
                let min_distance = min(diff13_norm, min(diff12_norm, diff23_norm));
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   545
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   546
                diff13 * min_distance / diff13_norm / 3
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   547
            }
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   548
        }
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   549
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   550
        if self.vertices.len() < 4 {
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   551
            return;
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   552
        }
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   553
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   554
        let delta = fp!(1 / segments_number);
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   555
        let mut bezierized_vertices = Vec::new();
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   556
        let mut pi = 0;
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   557
        let mut i = 1;
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   558
        let mut ni = 2;
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   559
        let mut right_point = calc_point(self.vertices[pi], self.vertices[i], self.vertices[ni]);
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   560
        let mut left_point;
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   561
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   562
        pi += 1;
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   563
        while pi != 0 {
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   564
            pi = i;
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   565
            i = ni;
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   566
            ni += 1;
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   567
            if ni >= self.vertices.len() {
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   568
                ni = 0;
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   569
            }
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   570
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   571
            left_point = right_point;
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   572
            right_point = calc_point(self.vertices[pi], self.vertices[i], self.vertices[ni]);
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   573
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   574
            bezierized_vertices.extend(BezierCurveSegments::new(
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   575
                Line::new(self.vertices[pi], self.vertices[i]),
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   576
                left_point,
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   577
                -right_point,
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   578
                delta,
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   579
            ));
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   580
        }
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   581
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   582
        self.vertices = bezierized_vertices;
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   583
    }
14099
d0b0d61b7d5e add polygons
alfadur
parents: 14097
diff changeset
   584
}
d0b0d61b7d5e add polygons
alfadur
parents: 14097
diff changeset
   585
14139
09f62bb046ef actually there is a way to preserve mutable polygon iterator
alfadur
parents: 14138
diff changeset
   586
struct PolygonPointsIteratorMut<'a> {
09f62bb046ef actually there is a way to preserve mutable polygon iterator
alfadur
parents: 14138
diff changeset
   587
    source: &'a mut Polygon,
09f62bb046ef actually there is a way to preserve mutable polygon iterator
alfadur
parents: 14138
diff changeset
   588
    start: *mut Point,
14145
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   589
    end: *mut Point,
14139
09f62bb046ef actually there is a way to preserve mutable polygon iterator
alfadur
parents: 14138
diff changeset
   590
}
09f62bb046ef actually there is a way to preserve mutable polygon iterator
alfadur
parents: 14138
diff changeset
   591
14145
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   592
impl<'a> Iterator for PolygonPointsIteratorMut<'a> {
14139
09f62bb046ef actually there is a way to preserve mutable polygon iterator
alfadur
parents: 14138
diff changeset
   593
    type Item = &'a mut Point;
09f62bb046ef actually there is a way to preserve mutable polygon iterator
alfadur
parents: 14138
diff changeset
   594
09f62bb046ef actually there is a way to preserve mutable polygon iterator
alfadur
parents: 14138
diff changeset
   595
    fn next(&mut self) -> Option<<Self as Iterator>::Item> {
09f62bb046ef actually there is a way to preserve mutable polygon iterator
alfadur
parents: 14138
diff changeset
   596
        if self.start == self.end {
09f62bb046ef actually there is a way to preserve mutable polygon iterator
alfadur
parents: 14138
diff changeset
   597
            None
09f62bb046ef actually there is a way to preserve mutable polygon iterator
alfadur
parents: 14138
diff changeset
   598
        } else {
09f62bb046ef actually there is a way to preserve mutable polygon iterator
alfadur
parents: 14138
diff changeset
   599
            unsafe {
09f62bb046ef actually there is a way to preserve mutable polygon iterator
alfadur
parents: 14138
diff changeset
   600
                let result = &mut *self.start;
09f62bb046ef actually there is a way to preserve mutable polygon iterator
alfadur
parents: 14138
diff changeset
   601
                self.start = self.start.add(1);
09f62bb046ef actually there is a way to preserve mutable polygon iterator
alfadur
parents: 14138
diff changeset
   602
                Some(result)
09f62bb046ef actually there is a way to preserve mutable polygon iterator
alfadur
parents: 14138
diff changeset
   603
            }
09f62bb046ef actually there is a way to preserve mutable polygon iterator
alfadur
parents: 14138
diff changeset
   604
        }
09f62bb046ef actually there is a way to preserve mutable polygon iterator
alfadur
parents: 14138
diff changeset
   605
    }
09f62bb046ef actually there is a way to preserve mutable polygon iterator
alfadur
parents: 14138
diff changeset
   606
}
09f62bb046ef actually there is a way to preserve mutable polygon iterator
alfadur
parents: 14138
diff changeset
   607
14145
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   608
impl<'a> Drop for PolygonPointsIteratorMut<'a> {
14139
09f62bb046ef actually there is a way to preserve mutable polygon iterator
alfadur
parents: 14138
diff changeset
   609
    fn drop(&mut self) {
09f62bb046ef actually there is a way to preserve mutable polygon iterator
alfadur
parents: 14138
diff changeset
   610
        self.source.force_close();
09f62bb046ef actually there is a way to preserve mutable polygon iterator
alfadur
parents: 14138
diff changeset
   611
    }
09f62bb046ef actually there is a way to preserve mutable polygon iterator
alfadur
parents: 14138
diff changeset
   612
}
09f62bb046ef actually there is a way to preserve mutable polygon iterator
alfadur
parents: 14138
diff changeset
   613
14099
d0b0d61b7d5e add polygons
alfadur
parents: 14097
diff changeset
   614
impl From<Vec<Point>> for Polygon {
d0b0d61b7d5e add polygons
alfadur
parents: 14097
diff changeset
   615
    fn from(mut v: Vec<Point>) -> Self {
d0b0d61b7d5e add polygons
alfadur
parents: 14097
diff changeset
   616
        if !v.is_empty() && v[0] != v[v.len() - 1] {
d0b0d61b7d5e add polygons
alfadur
parents: 14097
diff changeset
   617
            let start = v[0];
d0b0d61b7d5e add polygons
alfadur
parents: 14097
diff changeset
   618
            v.push(start)
d0b0d61b7d5e add polygons
alfadur
parents: 14097
diff changeset
   619
        }
d0b0d61b7d5e add polygons
alfadur
parents: 14097
diff changeset
   620
        Self { vertices: v }
d0b0d61b7d5e add polygons
alfadur
parents: 14097
diff changeset
   621
    }
d0b0d61b7d5e add polygons
alfadur
parents: 14097
diff changeset
   622
}
d0b0d61b7d5e add polygons
alfadur
parents: 14097
diff changeset
   623
14081
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14064
diff changeset
   624
#[derive(PartialEq, Eq, Clone, Copy, Debug)]
14136
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   625
pub struct Ray {
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   626
    pub start: Point,
14145
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   627
    pub direction: Point,
14136
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   628
}
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   629
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   630
impl Ray {
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   631
    #[inline]
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   632
    pub fn new(start: Point, direction: Point) -> Ray {
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   633
        Self { start, direction }
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   634
    }
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   635
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   636
    #[inline]
14147
11202097584f fix tangents
alfadur
parents: 14146
diff changeset
   637
    pub fn tangent_mul(&self, x: i32) -> i32 {
11202097584f fix tangents
alfadur
parents: 14146
diff changeset
   638
        self.direction.tangent_mul(x)
14136
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   639
    }
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   640
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   641
    #[inline]
14147
11202097584f fix tangents
alfadur
parents: 14146
diff changeset
   642
    pub fn cotangent_mul(&self, y: i32) -> i32 {
11202097584f fix tangents
alfadur
parents: 14146
diff changeset
   643
        self.direction.cotangent_mul(y)
14136
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   644
    }
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   645
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   646
    #[inline]
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   647
    pub fn orientation(&self, point: Point) -> i32 {
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   648
        (point - self.start).cross(self.direction).signum()
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   649
    }
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   650
}
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   651
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   652
#[derive(PartialEq, Eq, Clone, Copy, Debug)]
14081
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14064
diff changeset
   653
pub struct Line {
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14064
diff changeset
   654
    pub start: Point,
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14064
diff changeset
   655
    pub end: Point,
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14064
diff changeset
   656
}
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14064
diff changeset
   657
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14064
diff changeset
   658
impl Line {
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14064
diff changeset
   659
    #[inline]
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14064
diff changeset
   660
    pub fn new(start: Point, end: Point) -> Self {
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14064
diff changeset
   661
        Self { start, end }
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14064
diff changeset
   662
    }
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14064
diff changeset
   663
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14064
diff changeset
   664
    #[inline]
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14064
diff changeset
   665
    pub fn zero() -> Self {
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14064
diff changeset
   666
        Self::new(Point::zero(), Point::zero())
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14064
diff changeset
   667
    }
14082
5ade484f3351 Refactor tests, add fn center() for Line
unC0Rr
parents: 14081
diff changeset
   668
5ade484f3351 Refactor tests, add fn center() for Line
unC0Rr
parents: 14081
diff changeset
   669
    #[inline]
5ade484f3351 Refactor tests, add fn center() for Line
unC0Rr
parents: 14081
diff changeset
   670
    pub fn center(&self) -> Point {
14093
f483f844da98 component-wise division is actually useful sometimes
alfadur
parents: 14086
diff changeset
   671
        (self.start + self.end) / 2
14082
5ade484f3351 Refactor tests, add fn center() for Line
unC0Rr
parents: 14081
diff changeset
   672
    }
14111
5c1ce63114a5 a bit of simplification
alfadur
parents: 14101
diff changeset
   673
5c1ce63114a5 a bit of simplification
alfadur
parents: 14101
diff changeset
   674
    #[inline]
14136
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   675
    pub fn scaled_direction(&self) -> Point {
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   676
        self.end - self.start
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   677
    }
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   678
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   679
    #[inline]
14111
5c1ce63114a5 a bit of simplification
alfadur
parents: 14101
diff changeset
   680
    pub fn scaled_normal(&self) -> Point {
14136
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   681
        self.scaled_direction().rotate90()
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   682
    }
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   683
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   684
    #[inline]
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   685
    pub fn to_ray(&self) -> Ray {
c416d32764b7 organize landgen a bit more
alfadur
parents: 14131
diff changeset
   686
        Ray::new(self.start, self.scaled_direction())
14111
5c1ce63114a5 a bit of simplification
alfadur
parents: 14101
diff changeset
   687
    }
14081
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14064
diff changeset
   688
}
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14064
diff changeset
   689
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14064
diff changeset
   690
impl IntoIterator for Line {
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14064
diff changeset
   691
    type Item = Point;
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14064
diff changeset
   692
    type IntoIter = LinePoints;
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14064
diff changeset
   693
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14064
diff changeset
   694
    fn into_iter(self) -> Self::IntoIter {
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14064
diff changeset
   695
        LinePoints::new(self)
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14064
diff changeset
   696
    }
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14064
diff changeset
   697
}
14056
8a0d69c16cad Implement OutlinePoints for land generators, some ground work for template based landgen
unc0rr
parents: 13955
diff changeset
   698
13940
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   699
pub struct LinePoints {
13943
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   700
    accumulator: Point,
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   701
    direction: Point,
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   702
    sign: Point,
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   703
    current: Point,
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   704
    total_steps: i32,
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   705
    step: i32,
13940
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   706
}
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   707
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   708
impl LinePoints {
14081
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14064
diff changeset
   709
    pub fn new(line: Line) -> Self {
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14064
diff changeset
   710
        let dir = line.end - line.start;
13940
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   711
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   712
        Self {
13943
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   713
            accumulator: Point::zero(),
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   714
            direction: dir.abs(),
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   715
            sign: dir.signum(),
14081
e5904ead4864 Introduce OutlineSegmentsIterator, some refactoring
unC0Rr
parents: 14064
diff changeset
   716
            current: line.start,
13943
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   717
            total_steps: dir.max_norm(),
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   718
            step: 0,
13940
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   719
        }
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   720
    }
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   721
}
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   722
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   723
impl Iterator for LinePoints {
13943
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   724
    type Item = Point;
13940
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   725
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   726
    fn next(&mut self) -> Option<Self::Item> {
13943
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   727
        if self.step <= self.total_steps {
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   728
            self.accumulator += self.direction;
13940
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   729
13943
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   730
            if self.accumulator.x > self.total_steps {
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   731
                self.accumulator.x -= self.total_steps;
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   732
                self.current.x += self.sign.x;
13940
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   733
            }
13943
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   734
            if self.accumulator.y > self.total_steps {
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   735
                self.accumulator.y -= self.total_steps;
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   736
                self.current.y += self.sign.y;
13940
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   737
            }
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   738
13943
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   739
            self.step += 1;
13940
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   740
13943
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   741
            Some(self.current)
13940
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   742
        } else {
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   743
            None
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   744
        }
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   745
    }
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   746
}
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   747
13946
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   748
pub struct ArcPoints {
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   749
    point: Point,
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   750
    step: i32,
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   751
}
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   752
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   753
impl ArcPoints {
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   754
    pub fn new(radius: i32) -> Self {
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   755
        Self {
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   756
            point: Point::new(0, radius),
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   757
            step: 3 - 2 * radius,
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   758
        }
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   759
    }
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   760
}
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   761
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   762
impl Iterator for ArcPoints {
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   763
    type Item = Point;
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   764
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   765
    fn next(&mut self) -> Option<Self::Item> {
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   766
        if self.point.x < self.point.y {
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   767
            let result = self.point;
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   768
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   769
            if self.step < 0 {
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   770
                self.step += self.point.x * 4 + 6;
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   771
            } else {
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   772
                self.step += (self.point.x - self.point.y) * 4 + 10;
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   773
                self.point.y -= 1;
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   774
            }
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   775
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   776
            self.point.x += 1;
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   777
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   778
            Some(result)
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   779
        } else if self.point.x == self.point.y {
13952
85645992bc8a Fix ArcPoints never finishing
unc0rr
parents: 13948
diff changeset
   780
            self.point.x += 1;
13955
48796bef9e69 Add --protocol option to engine
unc0rr
parents: 13952
diff changeset
   781
13946
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   782
            Some(self.point)
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   783
        } else {
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   784
            None
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   785
        }
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   786
    }
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   787
}
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   788
13947
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   789
pub struct EquidistantPoints {
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   790
    vector: Point,
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   791
    iteration: u8,
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   792
}
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   793
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   794
impl EquidistantPoints {
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   795
    pub fn new(vector: Point) -> Self {
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   796
        Self {
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   797
            vector,
13948
a325ed57ebfe Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents: 13947
diff changeset
   798
            iteration: if vector.x == vector.y { 4 } else { 8 },
13947
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   799
        }
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   800
    }
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   801
}
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   802
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   803
impl Iterator for EquidistantPoints {
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   804
    type Item = Point;
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   805
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   806
    fn next(&mut self) -> Option<Self::Item> {
13948
a325ed57ebfe Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents: 13947
diff changeset
   807
        if self.iteration > 0 {
13947
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   808
            self.vector.x = -self.vector.x;
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   809
            if self.iteration & 1 == 0 {
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   810
                self.vector.y = -self.vector.y;
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   811
            }
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   812
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   813
            if self.iteration == 4 {
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   814
                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: 13946
diff changeset
   815
            }
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   816
13948
a325ed57ebfe Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents: 13947
diff changeset
   817
            self.iteration -= 1;
13947
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   818
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   819
            Some(self.vector)
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   820
        } else {
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   821
            None
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   822
        }
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   823
    }
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   824
}
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   825
14144
37c99587825d Implement BeizerCurveSegments, no tests
unc0rr
parents: 14142
diff changeset
   826
pub struct BezierCurveSegments {
37c99587825d Implement BeizerCurveSegments, no tests
unc0rr
parents: 14142
diff changeset
   827
    segment: Line,
14151
4791c9a7d5e8 add more point operators
alfadur
parents: 14149
diff changeset
   828
    control_point1: FPPoint,
4791c9a7d5e8 add more point operators
alfadur
parents: 14149
diff changeset
   829
    control_point2: FPPoint,
14144
37c99587825d Implement BeizerCurveSegments, no tests
unc0rr
parents: 14142
diff changeset
   830
    offset: FPNum,
14145
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   831
    max_offset: FPNum,
14144
37c99587825d Implement BeizerCurveSegments, no tests
unc0rr
parents: 14142
diff changeset
   832
    delta: FPNum,
14145
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   833
    have_finished: bool,
14144
37c99587825d Implement BeizerCurveSegments, no tests
unc0rr
parents: 14142
diff changeset
   834
}
37c99587825d Implement BeizerCurveSegments, no tests
unc0rr
parents: 14142
diff changeset
   835
37c99587825d Implement BeizerCurveSegments, no tests
unc0rr
parents: 14142
diff changeset
   836
impl BezierCurveSegments {
14145
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   837
    pub fn new(segment: Line, p1: FPPoint, p2: FPPoint, delta: FPNum) -> Self {
14144
37c99587825d Implement BeizerCurveSegments, no tests
unc0rr
parents: 14142
diff changeset
   838
        Self {
37c99587825d Implement BeizerCurveSegments, no tests
unc0rr
parents: 14142
diff changeset
   839
            segment,
14151
4791c9a7d5e8 add more point operators
alfadur
parents: 14149
diff changeset
   840
            control_point1: segment.start.to_fppoint() - p1,
4791c9a7d5e8 add more point operators
alfadur
parents: 14149
diff changeset
   841
            control_point2: segment.end.to_fppoint() - p2,
14144
37c99587825d Implement BeizerCurveSegments, no tests
unc0rr
parents: 14142
diff changeset
   842
            offset: fp!(0),
14145
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   843
            max_offset: fp!(4095 / 4096),
14144
37c99587825d Implement BeizerCurveSegments, no tests
unc0rr
parents: 14142
diff changeset
   844
            delta,
14145
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   845
            have_finished: false,
14144
37c99587825d Implement BeizerCurveSegments, no tests
unc0rr
parents: 14142
diff changeset
   846
        }
37c99587825d Implement BeizerCurveSegments, no tests
unc0rr
parents: 14142
diff changeset
   847
    }
37c99587825d Implement BeizerCurveSegments, no tests
unc0rr
parents: 14142
diff changeset
   848
}
37c99587825d Implement BeizerCurveSegments, no tests
unc0rr
parents: 14142
diff changeset
   849
37c99587825d Implement BeizerCurveSegments, no tests
unc0rr
parents: 14142
diff changeset
   850
impl Iterator for BezierCurveSegments {
37c99587825d Implement BeizerCurveSegments, no tests
unc0rr
parents: 14142
diff changeset
   851
    type Item = Point;
37c99587825d Implement BeizerCurveSegments, no tests
unc0rr
parents: 14142
diff changeset
   852
37c99587825d Implement BeizerCurveSegments, no tests
unc0rr
parents: 14142
diff changeset
   853
    fn next(&mut self) -> Option<Self::Item> {
14145
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   854
        if self.offset < self.max_offset {
14144
37c99587825d Implement BeizerCurveSegments, no tests
unc0rr
parents: 14142
diff changeset
   855
            let offset_sq = self.offset * self.offset;
37c99587825d Implement BeizerCurveSegments, no tests
unc0rr
parents: 14142
diff changeset
   856
            let offset_cub = offset_sq * self.offset;
37c99587825d Implement BeizerCurveSegments, no tests
unc0rr
parents: 14142
diff changeset
   857
37c99587825d Implement BeizerCurveSegments, no tests
unc0rr
parents: 14142
diff changeset
   858
            let r1 = fp!(1) - self.offset * 3 + offset_sq * 3 - offset_cub;
37c99587825d Implement BeizerCurveSegments, no tests
unc0rr
parents: 14142
diff changeset
   859
            let r2 = self.offset * 3 - offset_sq * 6 + offset_cub * 3;
37c99587825d Implement BeizerCurveSegments, no tests
unc0rr
parents: 14142
diff changeset
   860
            let r3 = offset_sq * 3 - offset_cub * 3;
37c99587825d Implement BeizerCurveSegments, no tests
unc0rr
parents: 14142
diff changeset
   861
14151
4791c9a7d5e8 add more point operators
alfadur
parents: 14149
diff changeset
   862
            let p = r1 * self.segment.start
4791c9a7d5e8 add more point operators
alfadur
parents: 14149
diff changeset
   863
                + r2 * self.control_point1
4791c9a7d5e8 add more point operators
alfadur
parents: 14149
diff changeset
   864
                + r3 * self.control_point2
4791c9a7d5e8 add more point operators
alfadur
parents: 14149
diff changeset
   865
                + offset_cub * self.segment.end;
14144
37c99587825d Implement BeizerCurveSegments, no tests
unc0rr
parents: 14142
diff changeset
   866
37c99587825d Implement BeizerCurveSegments, no tests
unc0rr
parents: 14142
diff changeset
   867
            self.offset += self.delta;
37c99587825d Implement BeizerCurveSegments, no tests
unc0rr
parents: 14142
diff changeset
   868
14151
4791c9a7d5e8 add more point operators
alfadur
parents: 14149
diff changeset
   869
            Some(Point::from_fppoint(&p))
14145
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   870
        } else if !self.have_finished {
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   871
            self.have_finished = true;
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   872
3078123e84ea Bezierize land outline
unc0rr
parents: 14144
diff changeset
   873
            Some(self.segment.end)
14144
37c99587825d Implement BeizerCurveSegments, no tests
unc0rr
parents: 14142
diff changeset
   874
        } else {
37c99587825d Implement BeizerCurveSegments, no tests
unc0rr
parents: 14142
diff changeset
   875
            None
37c99587825d Implement BeizerCurveSegments, no tests
unc0rr
parents: 14142
diff changeset
   876
        }
37c99587825d Implement BeizerCurveSegments, no tests
unc0rr
parents: 14142
diff changeset
   877
    }
37c99587825d Implement BeizerCurveSegments, no tests
unc0rr
parents: 14142
diff changeset
   878
}
37c99587825d Implement BeizerCurveSegments, no tests
unc0rr
parents: 14142
diff changeset
   879
13940
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   880
#[cfg(test)]
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   881
mod tests {
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   882
    use super::*;
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   883
13943
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   884
    fn get_points(coords: &[(i32, i32)]) -> Vec<Point> {
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   885
        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: 13942
diff changeset
   886
    }
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   887
13940
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   888
    #[test]
13947
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   889
    fn line_basic() {
14082
5ade484f3351 Refactor tests, add fn center() for Line
unC0Rr
parents: 14081
diff changeset
   890
        let line: Vec<Point> = Line::new(Point::new(0, 0), Point::new(3, 3))
5ade484f3351 Refactor tests, add fn center() for Line
unC0Rr
parents: 14081
diff changeset
   891
            .into_iter()
5ade484f3351 Refactor tests, add fn center() for Line
unC0Rr
parents: 14081
diff changeset
   892
            .collect();
5ade484f3351 Refactor tests, add fn center() for Line
unC0Rr
parents: 14081
diff changeset
   893
        let v = get_points(&[(0, 0), (1, 1), (2, 2), (3, 3)]);
13940
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   894
14082
5ade484f3351 Refactor tests, add fn center() for Line
unC0Rr
parents: 14081
diff changeset
   895
        assert_eq!(line, v);
13943
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   896
    }
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   897
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   898
    #[test]
13947
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   899
    fn line_skewed() {
14082
5ade484f3351 Refactor tests, add fn center() for Line
unC0Rr
parents: 14081
diff changeset
   900
        let line: Vec<Point> = Line::new(Point::new(0, 0), Point::new(5, -7))
5ade484f3351 Refactor tests, add fn center() for Line
unC0Rr
parents: 14081
diff changeset
   901
            .into_iter()
5ade484f3351 Refactor tests, add fn center() for Line
unC0Rr
parents: 14081
diff changeset
   902
            .collect();
13946
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   903
        let v = get_points(&[
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   904
            (0, 0),
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   905
            (1, -1),
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   906
            (2, -2),
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   907
            (2, -3),
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   908
            (3, -4),
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   909
            (4, -5),
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   910
            (4, -6),
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   911
            (5, -7),
3f69a70063a5 Implement ArcPoints iterator for circles
unc0rr
parents: 13943
diff changeset
   912
        ]);
13943
1fa905aa4cdb move point struct into integral-geometry and use it to refactor a bit
alfadur
parents: 13942
diff changeset
   913
14082
5ade484f3351 Refactor tests, add fn center() for Line
unC0Rr
parents: 14081
diff changeset
   914
        assert_eq!(line, v);
13940
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   915
    }
13947
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   916
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   917
    #[test]
13948
a325ed57ebfe Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents: 13947
diff changeset
   918
    fn equidistant_full() {
14082
5ade484f3351 Refactor tests, add fn center() for Line
unC0Rr
parents: 14081
diff changeset
   919
        let n: Vec<Point> = EquidistantPoints::new(Point::new(1, 3)).collect();
13947
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   920
        let v = get_points(&[
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   921
            (-1, -3),
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   922
            (1, -3),
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   923
            (-1, 3),
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   924
            (1, 3),
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   925
            (-3, -1),
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   926
            (3, -1),
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   927
            (-3, 1),
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   928
            (3, 1),
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   929
        ]);
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   930
14082
5ade484f3351 Refactor tests, add fn center() for Line
unC0Rr
parents: 14081
diff changeset
   931
        assert_eq!(n, v);
13947
7e7a03e85ac4 Add EquidistantPoints iterator to help iterating over all points of circles
unc0rr
parents: 13946
diff changeset
   932
    }
13948
a325ed57ebfe Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents: 13947
diff changeset
   933
a325ed57ebfe Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents: 13947
diff changeset
   934
    #[test]
a325ed57ebfe Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents: 13947
diff changeset
   935
    fn equidistant_half() {
14082
5ade484f3351 Refactor tests, add fn center() for Line
unC0Rr
parents: 14081
diff changeset
   936
        let n: Vec<Point> = EquidistantPoints::new(Point::new(2, 2)).collect();
5ade484f3351 Refactor tests, add fn center() for Line
unC0Rr
parents: 14081
diff changeset
   937
        let v = get_points(&[(-2, -2), (2, -2), (-2, 2), (2, 2)]);
5ade484f3351 Refactor tests, add fn center() for Line
unC0Rr
parents: 14081
diff changeset
   938
5ade484f3351 Refactor tests, add fn center() for Line
unC0Rr
parents: 14081
diff changeset
   939
        assert_eq!(n, v);
5ade484f3351 Refactor tests, add fn center() for Line
unC0Rr
parents: 14081
diff changeset
   940
    }
13948
a325ed57ebfe Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents: 13947
diff changeset
   941
14082
5ade484f3351 Refactor tests, add fn center() for Line
unC0Rr
parents: 14081
diff changeset
   942
    #[test]
5ade484f3351 Refactor tests, add fn center() for Line
unC0Rr
parents: 14081
diff changeset
   943
    fn line() {
5ade484f3351 Refactor tests, add fn center() for Line
unC0Rr
parents: 14081
diff changeset
   944
        let l = Line::new(Point::new(1, 1), Point::new(5, 6));
5ade484f3351 Refactor tests, add fn center() for Line
unC0Rr
parents: 14081
diff changeset
   945
5ade484f3351 Refactor tests, add fn center() for Line
unC0Rr
parents: 14081
diff changeset
   946
        assert_eq!(l.center(), Point::new(3, 3));
13948
a325ed57ebfe Don't generate unnecessary duplication in case of equal coordinates
unc0rr
parents: 13947
diff changeset
   947
    }
14083
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14082
diff changeset
   948
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14082
diff changeset
   949
    #[test]
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14082
diff changeset
   950
    fn rect() {
14142
3119d665d3c6 collapse rectangle types back together with consistent usage of size
alfadur
parents: 14140
diff changeset
   951
        let r = Rect::from_box(10, 100, 0, 70);
14083
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14082
diff changeset
   952
14086
5d42204ac35e Start convertion of FindPoint()
unC0Rr
parents: 14083
diff changeset
   953
        assert!(r.contains_inside(Point::new(99, 69)));
5d42204ac35e Start convertion of FindPoint()
unC0Rr
parents: 14083
diff changeset
   954
        assert!(!r.contains_inside(Point::new(100, 70)));
5d42204ac35e Start convertion of FindPoint()
unC0Rr
parents: 14083
diff changeset
   955
14083
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14082
diff changeset
   956
        assert_eq!(r.top_left(), Point::new(10, 0));
14142
3119d665d3c6 collapse rectangle types back together with consistent usage of size
alfadur
parents: 14140
diff changeset
   957
        assert_eq!(r.with_margin(12), Rect::from_box(22, 88, 12, 58));
14083
bf40b5f938b0 - Add methods to work with Rect as box
unC0Rr
parents: 14082
diff changeset
   958
    }
14130
376a0551b00a - Add distance-divider option to land_dump
unc0rr
parents: 14129
diff changeset
   959
376a0551b00a - Add distance-divider option to land_dump
unc0rr
parents: 14129
diff changeset
   960
    #[test]
376a0551b00a - Add distance-divider option to land_dump
unc0rr
parents: 14129
diff changeset
   961
    fn fit() {
14142
3119d665d3c6 collapse rectangle types back together with consistent usage of size
alfadur
parents: 14140
diff changeset
   962
        let r = Rect::from_box(10, 100, 0, 70);
14130
376a0551b00a - Add distance-divider option to land_dump
unc0rr
parents: 14129
diff changeset
   963
14140
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   964
        assert_eq!(Point::new(0, -10).clamp(&r), Point::new(10, 0));
7f5a591e1c43 separate rectangle types based on right/bottom edge inclusivity
alfadur
parents: 14139
diff changeset
   965
        assert_eq!(Point::new(1000, 1000).clamp(&r), Point::new(100, 70));
14130
376a0551b00a - Add distance-divider option to land_dump
unc0rr
parents: 14129
diff changeset
   966
    }
13940
75eaf7c71789 Introduce integral-geometry crate, implement LinePoints iterator
unc0rr
parents:
diff changeset
   967
}