rust/mapgen/src/lib.rs
author nemo
Wed, 09 Jan 2019 16:27:57 -0500
changeset 14536 e0af4ce7d8bc
parent 14180 76a52e8149e3
child 14707 29dbe9ce8b7d
permissions -rw-r--r--
fix incorrect mask set in r7b4643ff60ea - this causes ghost hog collisions and odd hog jumps on overlap with active hog
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
14156
3c8a33ba06ba start loading theme textures
alfadur
parents: 14142
diff changeset
     1
pub mod theme;
3c8a33ba06ba start loading theme textures
alfadur
parents: 14142
diff changeset
     2
14132
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
     3
use std::{
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
     4
    collections::hash_map::HashMap,
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
     5
    borrow::Borrow,
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
     6
    mem::replace
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
     7
};
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
     8
use serde_derive::{Deserialize};
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
     9
use serde_yaml;
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    10
use integral_geometry::{Point, Size, Rect};
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    11
use landgen::{
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    12
    outline_template::OutlineTemplate
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    13
};
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    14
use rand::{thread_rng, Rng};
14156
3c8a33ba06ba start loading theme textures
alfadur
parents: 14142
diff changeset
    15
use land2d::Land2D;
14165
c24a76f131d6 implement basic land texturing
alfadur
parents: 14161
diff changeset
    16
use vec2d::Vec2D;
14161
74ca70cb753d fix mapgen
alfadur
parents: 14156
diff changeset
    17
use self::theme::Theme;
14132
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    18
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    19
#[derive(Deserialize)]
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    20
struct PointDesc {
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    21
    x: u32,
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    22
    y: u32
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    23
}
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    24
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    25
#[derive(Deserialize)]
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    26
struct RectDesc {
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    27
    x: u32,
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    28
    y: u32,
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    29
    w: u32,
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    30
    h: u32
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    31
}
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    32
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    33
#[derive(Deserialize)]
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    34
struct TemplateDesc {
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    35
    width: usize,
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    36
    height: usize,
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    37
    can_flip: bool,
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    38
    can_invert: bool,
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    39
    can_mirror: bool,
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    40
    is_negative: bool,
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    41
    put_girders: bool,
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    42
    max_hedgehogs: u8,
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    43
    outline_points: Vec<Vec<RectDesc>>,
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    44
    fill_points: Vec<PointDesc>
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    45
}
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    46
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    47
#[derive(Deserialize)]
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    48
struct TemplateCollectionDesc {
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    49
    templates: Vec<TemplateDesc>,
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    50
    template_types: HashMap<String, Vec<usize>>
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    51
}
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    52
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    53
impl From<&TemplateDesc> for OutlineTemplate {
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    54
    fn from(desc: &TemplateDesc) -> Self {
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    55
        OutlineTemplate {
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    56
            islands: desc.outline_points.iter()
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    57
                .map(|v| v.iter()
14142
3119d665d3c6 collapse rectangle types back together with consistent usage of size
alfadur
parents: 14133
diff changeset
    58
                    .map(|r| Rect::from_size(
3119d665d3c6 collapse rectangle types back together with consistent usage of size
alfadur
parents: 14133
diff changeset
    59
                        Point::new(r.x as i32, r.y as i32),
3119d665d3c6 collapse rectangle types back together with consistent usage of size
alfadur
parents: 14133
diff changeset
    60
                        Size::new(r.w as usize, r.h as usize)))
14132
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    61
                    .collect())
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    62
                .collect(),
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    63
            fill_points: desc.fill_points.iter()
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    64
                .map(|p| Point::new(p.x as i32, p.y as i32))
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    65
                .collect(),
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    66
            size: Size::new(desc.width, desc.height),
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    67
            can_flip: desc.can_flip,
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    68
            can_invert: desc.can_invert,
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    69
            can_mirror: desc.can_mirror,
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    70
            is_negative: desc.is_negative
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    71
        }
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    72
    }
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    73
}
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    74
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    75
#[derive(PartialEq, Eq, Hash, Clone, Debug)]
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    76
struct TemplateType(String);
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    77
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    78
impl Borrow<str> for TemplateType {
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    79
    fn borrow(&self) -> &str {
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    80
        self.0.as_str()
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    81
    }
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    82
}
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    83
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    84
#[derive(Debug)]
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    85
pub struct MapGenerator {
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    86
    pub(crate) templates: HashMap<TemplateType, Vec<OutlineTemplate>>
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    87
}
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    88
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    89
impl MapGenerator {
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    90
    pub fn new() -> Self {
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    91
        Self { templates: HashMap::new() }
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    92
    }
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    93
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    94
    pub fn import_yaml_templates(&mut self, text: &str) {
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    95
        let mut desc: TemplateCollectionDesc = serde_yaml::from_str(text).unwrap();
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    96
        let templates = replace(&mut desc.templates, vec![]);
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    97
        self.templates = desc.template_types.into_iter()
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    98
            .map(|(size, indices)|
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
    99
                (TemplateType(size), indices.iter()
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   100
                    .map(|i| (&templates[*i]).into())
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   101
                    .collect()))
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   102
            .collect();
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   103
    }
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   104
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   105
    pub fn get_template(&self, template_type: &str) -> Option<&OutlineTemplate> {
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   106
        self.templates.get(template_type).and_then(|t| thread_rng().choose(t))
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   107
    }
14156
3c8a33ba06ba start loading theme textures
alfadur
parents: 14142
diff changeset
   108
14169
1749961647b9 fix texturing and add a theme loading option to land_dump
alfadur
parents: 14165
diff changeset
   109
    pub fn make_texture(&self, land: &Land2D<u8>, theme: &Theme) -> Vec2D<u32> {
14165
c24a76f131d6 implement basic land texturing
alfadur
parents: 14161
diff changeset
   110
        let mut texture = Vec2D::new(land.size(), 0);
14175
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   111
14165
c24a76f131d6 implement basic land texturing
alfadur
parents: 14161
diff changeset
   112
        if let Some(land_sprite) = theme.land_texture() {
c24a76f131d6 implement basic land texturing
alfadur
parents: 14161
diff changeset
   113
            for (row_index, (land_row, tex_row)) in land.rows()
c24a76f131d6 implement basic land texturing
alfadur
parents: 14161
diff changeset
   114
                .zip(texture.rows_mut())
c24a76f131d6 implement basic land texturing
alfadur
parents: 14161
diff changeset
   115
                .enumerate()
c24a76f131d6 implement basic land texturing
alfadur
parents: 14161
diff changeset
   116
            {
c24a76f131d6 implement basic land texturing
alfadur
parents: 14161
diff changeset
   117
                let sprite_row = land_sprite.get_row(row_index % land_sprite.height());
c24a76f131d6 implement basic land texturing
alfadur
parents: 14161
diff changeset
   118
                let mut x_offset = 0;
c24a76f131d6 implement basic land texturing
alfadur
parents: 14161
diff changeset
   119
                while sprite_row.len() < land.width() - x_offset {
c24a76f131d6 implement basic land texturing
alfadur
parents: 14161
diff changeset
   120
                    let copy_range = x_offset..x_offset + sprite_row.len();
c24a76f131d6 implement basic land texturing
alfadur
parents: 14161
diff changeset
   121
                    tex_row_copy(
c24a76f131d6 implement basic land texturing
alfadur
parents: 14161
diff changeset
   122
                        &land_row[copy_range.clone()],
c24a76f131d6 implement basic land texturing
alfadur
parents: 14161
diff changeset
   123
                        &mut tex_row[copy_range],
c24a76f131d6 implement basic land texturing
alfadur
parents: 14161
diff changeset
   124
                        sprite_row
c24a76f131d6 implement basic land texturing
alfadur
parents: 14161
diff changeset
   125
                    );
c24a76f131d6 implement basic land texturing
alfadur
parents: 14161
diff changeset
   126
c24a76f131d6 implement basic land texturing
alfadur
parents: 14161
diff changeset
   127
                    x_offset += land_sprite.width()
c24a76f131d6 implement basic land texturing
alfadur
parents: 14161
diff changeset
   128
                }
14156
3c8a33ba06ba start loading theme textures
alfadur
parents: 14142
diff changeset
   129
14165
c24a76f131d6 implement basic land texturing
alfadur
parents: 14161
diff changeset
   130
                if x_offset < land.width() {
14169
1749961647b9 fix texturing and add a theme loading option to land_dump
alfadur
parents: 14165
diff changeset
   131
                    let final_range = x_offset..land.width();
14165
c24a76f131d6 implement basic land texturing
alfadur
parents: 14161
diff changeset
   132
                    tex_row_copy(
c24a76f131d6 implement basic land texturing
alfadur
parents: 14161
diff changeset
   133
                        &land_row[final_range.clone()],
c24a76f131d6 implement basic land texturing
alfadur
parents: 14161
diff changeset
   134
                        &mut tex_row[final_range],
c24a76f131d6 implement basic land texturing
alfadur
parents: 14161
diff changeset
   135
                        &sprite_row[..land.width() - x_offset]
c24a76f131d6 implement basic land texturing
alfadur
parents: 14161
diff changeset
   136
                    );
c24a76f131d6 implement basic land texturing
alfadur
parents: 14161
diff changeset
   137
                }
c24a76f131d6 implement basic land texturing
alfadur
parents: 14161
diff changeset
   138
            }
c24a76f131d6 implement basic land texturing
alfadur
parents: 14161
diff changeset
   139
        }
14175
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   140
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   141
        if let Some(border_sprite) = theme.border_texture() {
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   142
            assert!(border_sprite.height() <= 512);
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   143
            let border_width = (border_sprite.height() / 2) as u8;
14180
76a52e8149e3 add some texture transforms
alfadur
parents: 14175
diff changeset
   144
            let border_sprite = border_sprite.to_tiled();
14175
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   145
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   146
            let mut offsets = vec![255u8; land.width()];
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   147
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   148
            land_border_pass(
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   149
                land.rows().rev().zip(texture.rows_mut().rev()),
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   150
                &mut offsets,
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   151
                border_width,
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   152
                |x, y| border_sprite.get_pixel(
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   153
                    x % border_sprite.width(),
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   154
                    border_sprite.height() - 1 - y,
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   155
                )
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   156
            );
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   157
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   158
            offsets.iter_mut().for_each(|v| *v = 255);
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   159
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   160
            land_border_pass(
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   161
                land.rows().zip(texture.rows_mut()),
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   162
                &mut offsets,
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   163
                border_width,
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   164
                |x, y| border_sprite.get_pixel(
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   165
                    x % border_sprite.width(),
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   166
                    y,
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   167
                )
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   168
            );
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   169
        }
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   170
14165
c24a76f131d6 implement basic land texturing
alfadur
parents: 14161
diff changeset
   171
        texture
14156
3c8a33ba06ba start loading theme textures
alfadur
parents: 14142
diff changeset
   172
    }
14132
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   173
}
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   174
14175
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   175
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   176
struct Color(u32);
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   177
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   178
impl Color {
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   179
    #[inline]
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   180
    fn red(self) -> u8 {
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   181
        (self.0 >> 0 & 0xFF) as u8
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   182
    }
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   183
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   184
    #[inline]
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   185
    fn green(self) -> u8 {
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   186
        (self.0 >> 8 & 0xFF) as u8
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   187
    }
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   188
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   189
    #[inline]
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   190
    fn blue(self) -> u8 {
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   191
        (self.0 >> 16 & 0xFF) as u8
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   192
    }
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   193
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   194
    #[inline]
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   195
    fn alpha(self) -> u8 {
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   196
        (self.0 >> 24 & 0xFF) as u8
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   197
    }
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   198
}
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   199
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   200
#[inline]
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   201
fn lerp(from: u8, to: u8, coef: u8) -> u8 {
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   202
    ((from as u16 * (256 - coef as u16) + to as u16 * coef as u16) / 256) as u8
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   203
}
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   204
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   205
#[inline]
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   206
fn blend(source: u32, target: u32) -> u32 {
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   207
    let source = Color(source);
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   208
    let target = Color(target);
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   209
    let alpha = lerp(target.alpha(), 255, source.alpha());
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   210
    let red = lerp(target.red(), source.red(), source.alpha());
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   211
    let green = lerp(target.green(), source.green(), source.alpha());
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   212
    let blue = lerp(target.blue(), source.blue(), source.alpha());
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   213
    (red as u32) << 0 | (green as u32) << 8 | (blue as u32) << 16 | (alpha as u32) << 24
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   214
}
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   215
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   216
fn land_border_pass<'a, T, F>(rows: T, offsets: &mut [u8], border_width: u8, pixel_getter: F)
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   217
    where T: Iterator<Item = (&'a [u8], &'a mut [u32])>,
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   218
          F: (Fn(usize, usize) -> u32)
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   219
{
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   220
    for (land_row, tex_row) in rows {
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   221
        for (x, ((land_v, tex_v), offset_v)) in land_row.iter()
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   222
            .zip(tex_row.iter_mut())
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   223
            .zip(offsets.iter_mut())
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   224
            .enumerate()
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   225
        {
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   226
            *offset_v = if *land_v == 0 {
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   227
                if *offset_v < border_width {
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   228
                    *tex_v = blend(
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   229
                        pixel_getter(x, *offset_v as usize),
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   230
                        *tex_v,
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   231
                    )
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   232
                }
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   233
                offset_v.saturating_add(1)
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   234
            } else {
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   235
                0
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   236
            }
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   237
        }
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   238
    }
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   239
}
a4c1a2d0ac24 implement basic land bordering
alfadur
parents: 14169
diff changeset
   240
14169
1749961647b9 fix texturing and add a theme loading option to land_dump
alfadur
parents: 14165
diff changeset
   241
fn tex_row_copy(land_row: &[u8], tex_row: &mut [u32], sprite_row: &[u32]) {
14165
c24a76f131d6 implement basic land texturing
alfadur
parents: 14161
diff changeset
   242
    for ((land_v, tex_v), sprite_v) in
c24a76f131d6 implement basic land texturing
alfadur
parents: 14161
diff changeset
   243
        land_row.iter().zip(tex_row.iter_mut()).zip(sprite_row)
14169
1749961647b9 fix texturing and add a theme loading option to land_dump
alfadur
parents: 14165
diff changeset
   244
    {
1749961647b9 fix texturing and add a theme loading option to land_dump
alfadur
parents: 14165
diff changeset
   245
        *tex_v = if *land_v == 0 {
1749961647b9 fix texturing and add a theme loading option to land_dump
alfadur
parents: 14165
diff changeset
   246
            *sprite_v
1749961647b9 fix texturing and add a theme loading option to land_dump
alfadur
parents: 14165
diff changeset
   247
        } else {
1749961647b9 fix texturing and add a theme loading option to land_dump
alfadur
parents: 14165
diff changeset
   248
            0
14165
c24a76f131d6 implement basic land texturing
alfadur
parents: 14161
diff changeset
   249
        }
14169
1749961647b9 fix texturing and add a theme loading option to land_dump
alfadur
parents: 14165
diff changeset
   250
    }
14165
c24a76f131d6 implement basic land texturing
alfadur
parents: 14161
diff changeset
   251
}
c24a76f131d6 implement basic land texturing
alfadur
parents: 14161
diff changeset
   252
14132
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   253
#[cfg(test)]
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   254
mod tests {
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   255
    use crate::{
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   256
        MapGenerator,
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   257
        TemplateType
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   258
    };
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   259
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   260
    #[test]
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   261
    fn simple_load() {
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   262
        let text = r#"
14133
b04dac00e8e2 add command arguments to use a template from file into land_dump
alfadur
parents: 14132
diff changeset
   263
# comment
b04dac00e8e2 add command arguments to use a template from file into land_dump
alfadur
parents: 14132
diff changeset
   264
14132
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   265
templates:
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   266
  -
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   267
    width: 3072
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   268
    height: 1424
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   269
    can_flip: false
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   270
    can_invert: false
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   271
    can_mirror: true
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   272
    is_negative: false
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   273
    put_girders: true
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   274
    max_hedgehogs: 18
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   275
    outline_points:
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   276
      -
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   277
        - {x: 748, y: 1424, w: 1, h: 1}
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   278
        - {x: 636, y: 1252, w: 208, h: 72}
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   279
        - {x: 898, y: 1110, w: 308, h: 60}
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   280
        - {x: 1128, y: 1252, w: 434, h: 40}
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   281
        - {x: 1574, y: 1112, w: 332, h: 40}
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   282
        - {x: 1802, y: 1238, w: 226, h: 36}
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   283
        - {x: 1930, y: 1424, w: 1, h: 1}
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   284
    fill_points:
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   285
      - {x: 1023, y: 0}
14133
b04dac00e8e2 add command arguments to use a template from file into land_dump
alfadur
parents: 14132
diff changeset
   286
      - {x: 1023, y: 0}
14132
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   287
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   288
template_types:
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   289
    test: [0]
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   290
"#;
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   291
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   292
        let mut generator = MapGenerator::new();
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   293
        generator.import_yaml_templates(&text);
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   294
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   295
        assert!(generator.templates.contains_key(&TemplateType("test".to_string())));
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   296
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   297
        let template = generator.get_template("test").unwrap();
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   298
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   299
        assert_eq!(template.islands[0].len(), 7);
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   300
    }
0c5b9cfda9ab add a higher level map generation lib to load yaml templates into somewhere
alfadur
parents:
diff changeset
   301
}