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