author | unC0Rr |
Thu, 30 Jan 2025 13:59:41 +0100 | |
changeset 16076 | 8c90c8751b90 |
parent 16073 | 5d302b12d837 |
child 16077 | aba25f4e4645 |
permissions | -rw-r--r-- |
15924 | 1 |
use integral_geometry::Size; |
15923
d46ad15c6dec
Get wavefront collapse generator to work in engine
unC0Rr
parents:
15922
diff
changeset
|
2 |
|
15924 | 3 |
use landgen::wavefront_collapse::generator::*; |
15922
da6b67f13c12
Refactor mapgen to allow for easy switching between generators
unC0Rr
parents:
diff
changeset
|
4 |
use serde_derive::Deserialize; |
15923
d46ad15c6dec
Get wavefront collapse generator to work in engine
unC0Rr
parents:
15922
diff
changeset
|
5 |
|
15924 | 6 |
use std::collections::hash_map::HashMap; |
15922
da6b67f13c12
Refactor mapgen to allow for easy switching between generators
unC0Rr
parents:
diff
changeset
|
7 |
|
16059
2acea266d297
Fix generation in corners by extending outline edge definitions
unC0Rr
parents:
15925
diff
changeset
|
8 |
#[derive(Debug, Deserialize)] |
15922
da6b67f13c12
Refactor mapgen to allow for easy switching between generators
unC0Rr
parents:
diff
changeset
|
9 |
pub struct TileDesc { |
da6b67f13c12
Refactor mapgen to allow for easy switching between generators
unC0Rr
parents:
diff
changeset
|
10 |
pub name: String, |
16064 | 11 |
pub edges: [String; 4], |
15924 | 12 |
pub is_negative: Option<bool>, |
13 |
pub can_flip: Option<bool>, |
|
14 |
pub can_mirror: Option<bool>, |
|
15 |
pub can_rotate90: Option<bool>, |
|
16 |
pub can_rotate180: Option<bool>, |
|
17 |
pub can_rotate270: Option<bool>, |
|
15922
da6b67f13c12
Refactor mapgen to allow for easy switching between generators
unC0Rr
parents:
diff
changeset
|
18 |
} |
da6b67f13c12
Refactor mapgen to allow for easy switching between generators
unC0Rr
parents:
diff
changeset
|
19 |
|
16059
2acea266d297
Fix generation in corners by extending outline edge definitions
unC0Rr
parents:
15925
diff
changeset
|
20 |
#[derive(Debug, Deserialize)] |
2acea266d297
Fix generation in corners by extending outline edge definitions
unC0Rr
parents:
15925
diff
changeset
|
21 |
pub struct ComplexEdgeDesc { |
16064 | 22 |
pub begin: Option<String>, |
23 |
pub fill: Option<String>, |
|
24 |
pub end: Option<String>, |
|
16059
2acea266d297
Fix generation in corners by extending outline edge definitions
unC0Rr
parents:
15925
diff
changeset
|
25 |
} |
2acea266d297
Fix generation in corners by extending outline edge definitions
unC0Rr
parents:
15925
diff
changeset
|
26 |
#[derive(Debug, Deserialize)] |
2acea266d297
Fix generation in corners by extending outline edge definitions
unC0Rr
parents:
15925
diff
changeset
|
27 |
pub struct NonStrictComplexEdgesDesc { |
2acea266d297
Fix generation in corners by extending outline edge definitions
unC0Rr
parents:
15925
diff
changeset
|
28 |
pub top: Option<ComplexEdgeDesc>, |
2acea266d297
Fix generation in corners by extending outline edge definitions
unC0Rr
parents:
15925
diff
changeset
|
29 |
pub right: Option<ComplexEdgeDesc>, |
2acea266d297
Fix generation in corners by extending outline edge definitions
unC0Rr
parents:
15925
diff
changeset
|
30 |
pub bottom: Option<ComplexEdgeDesc>, |
2acea266d297
Fix generation in corners by extending outline edge definitions
unC0Rr
parents:
15925
diff
changeset
|
31 |
pub left: Option<ComplexEdgeDesc>, |
15925
b0e8cc72bfef
Allow defining compatible edges for grid, add few more templates
unC0Rr
parents:
15924
diff
changeset
|
32 |
} |
15922
da6b67f13c12
Refactor mapgen to allow for easy switching between generators
unC0Rr
parents:
diff
changeset
|
33 |
|
16059
2acea266d297
Fix generation in corners by extending outline edge definitions
unC0Rr
parents:
15925
diff
changeset
|
34 |
#[derive(Debug, Deserialize)] |
15922
da6b67f13c12
Refactor mapgen to allow for easy switching between generators
unC0Rr
parents:
diff
changeset
|
35 |
pub struct TemplateDesc { |
16073 | 36 |
pub width: u32, |
37 |
pub height: u32, |
|
16065 | 38 |
pub can_invert: Option<bool>, |
39 |
pub is_negative: Option<bool>, |
|
40 |
pub put_girders: Option<bool>, |
|
15922
da6b67f13c12
Refactor mapgen to allow for easy switching between generators
unC0Rr
parents:
diff
changeset
|
41 |
pub max_hedgehogs: u8, |
16065 | 42 |
pub wrap: Option<bool>, |
43 |
pub edges: Option<String>, |
|
44 |
pub tiles: Vec<String>, |
|
15922
da6b67f13c12
Refactor mapgen to allow for easy switching between generators
unC0Rr
parents:
diff
changeset
|
45 |
} |
da6b67f13c12
Refactor mapgen to allow for easy switching between generators
unC0Rr
parents:
diff
changeset
|
46 |
|
16059
2acea266d297
Fix generation in corners by extending outline edge definitions
unC0Rr
parents:
15925
diff
changeset
|
47 |
#[derive(Debug, Deserialize)] |
15922
da6b67f13c12
Refactor mapgen to allow for easy switching between generators
unC0Rr
parents:
diff
changeset
|
48 |
pub struct TemplateCollectionDesc { |
da6b67f13c12
Refactor mapgen to allow for easy switching between generators
unC0Rr
parents:
diff
changeset
|
49 |
pub templates: Vec<TemplateDesc>, |
16065 | 50 |
pub tiles: HashMap<String, Vec<TileDesc>>, |
51 |
pub edges: HashMap<String, NonStrictComplexEdgesDesc>, |
|
15922
da6b67f13c12
Refactor mapgen to allow for easy switching between generators
unC0Rr
parents:
diff
changeset
|
52 |
pub template_types: HashMap<String, Vec<usize>>, |
da6b67f13c12
Refactor mapgen to allow for easy switching between generators
unC0Rr
parents:
diff
changeset
|
53 |
} |
da6b67f13c12
Refactor mapgen to allow for easy switching between generators
unC0Rr
parents:
diff
changeset
|
54 |
|
16065 | 55 |
impl TemplateDesc { |
16073 | 56 |
pub fn to_template( |
57 |
&self, |
|
58 |
tiles: &HashMap<String, Vec<TileDesc>>, |
|
59 |
edges: &HashMap<String, NonStrictComplexEdgesDesc>, |
|
60 |
) -> TemplateDescription { |
|
16064 | 61 |
let [top, right, bottom, left]: [Option<ComplexEdgeDescription>; 4] = |
16065 | 62 |
if let Some(edges_name) = &self.edges { |
63 |
let edges = edges.get(edges_name).expect("missing template edges"); |
|
16064 | 64 |
[&edges.top, &edges.right, &edges.bottom, &edges.left] |
65 |
.map(|e| e.as_ref().map(Into::into)) |
|
66 |
} else { |
|
67 |
[None, None, None, None] |
|
68 |
}; |
|
15925
b0e8cc72bfef
Allow defining compatible edges for grid, add few more templates
unC0Rr
parents:
15924
diff
changeset
|
69 |
|
16073 | 70 |
let tiles = self |
71 |
.tiles |
|
72 |
.iter() |
|
73 |
.flat_map(|t| tiles.get(t).expect("missing template tiles")) |
|
74 |
.collect::<Vec<_>>(); |
|
16065 | 75 |
|
76 |
TemplateDescription { |
|
77 |
size: Size::new(self.width, self.height), |
|
78 |
tiles: tiles.into_iter().map(|t| t.into()).collect(), |
|
79 |
wrap: self.wrap.unwrap_or(false), |
|
80 |
can_invert: self.can_invert.unwrap_or(false), |
|
81 |
is_negative: self.is_negative.unwrap_or(false), |
|
16059
2acea266d297
Fix generation in corners by extending outline edge definitions
unC0Rr
parents:
15925
diff
changeset
|
82 |
edges: NonStrictComplexEdgesDescription { |
15925
b0e8cc72bfef
Allow defining compatible edges for grid, add few more templates
unC0Rr
parents:
15924
diff
changeset
|
83 |
top, |
b0e8cc72bfef
Allow defining compatible edges for grid, add few more templates
unC0Rr
parents:
15924
diff
changeset
|
84 |
right, |
b0e8cc72bfef
Allow defining compatible edges for grid, add few more templates
unC0Rr
parents:
15924
diff
changeset
|
85 |
bottom, |
b0e8cc72bfef
Allow defining compatible edges for grid, add few more templates
unC0Rr
parents:
15924
diff
changeset
|
86 |
left, |
b0e8cc72bfef
Allow defining compatible edges for grid, add few more templates
unC0Rr
parents:
15924
diff
changeset
|
87 |
}, |
15922
da6b67f13c12
Refactor mapgen to allow for easy switching between generators
unC0Rr
parents:
diff
changeset
|
88 |
} |
da6b67f13c12
Refactor mapgen to allow for easy switching between generators
unC0Rr
parents:
diff
changeset
|
89 |
} |
da6b67f13c12
Refactor mapgen to allow for easy switching between generators
unC0Rr
parents:
diff
changeset
|
90 |
} |
16059
2acea266d297
Fix generation in corners by extending outline edge definitions
unC0Rr
parents:
15925
diff
changeset
|
91 |
|
16064 | 92 |
impl From<&TileDesc> for TileDescription { |
93 |
fn from(desc: &TileDesc) -> Self { |
|
94 |
let [top, right, bottom, left]: [EdgeDescription; 4] = desc.edges.clone().map(|e| e.into()); |
|
95 |
||
96 |
Self { |
|
97 |
name: desc.name.clone(), |
|
98 |
edges: EdgesDescription { |
|
99 |
top, |
|
100 |
right, |
|
101 |
bottom, |
|
102 |
left, |
|
103 |
}, |
|
104 |
is_negative: desc.is_negative, |
|
105 |
can_flip: desc.can_flip, |
|
106 |
can_mirror: desc.can_mirror, |
|
107 |
can_rotate90: desc.can_rotate90, |
|
108 |
can_rotate180: desc.can_rotate180, |
|
109 |
can_rotate270: desc.can_rotate270, |
|
110 |
} |
|
111 |
} |
|
112 |
} |
|
113 |
||
16059
2acea266d297
Fix generation in corners by extending outline edge definitions
unC0Rr
parents:
15925
diff
changeset
|
114 |
impl From<&ComplexEdgeDesc> for ComplexEdgeDescription { |
2acea266d297
Fix generation in corners by extending outline edge definitions
unC0Rr
parents:
15925
diff
changeset
|
115 |
fn from(value: &ComplexEdgeDesc) -> Self { |
2acea266d297
Fix generation in corners by extending outline edge definitions
unC0Rr
parents:
15925
diff
changeset
|
116 |
Self { |
16064 | 117 |
begin: value.begin.as_ref().map(|e| e.into()), |
118 |
fill: value.fill.as_ref().map(|e| e.into()), |
|
119 |
end: value.end.as_ref().map(|e| e.into()), |
|
16059
2acea266d297
Fix generation in corners by extending outline edge definitions
unC0Rr
parents:
15925
diff
changeset
|
120 |
} |
2acea266d297
Fix generation in corners by extending outline edge definitions
unC0Rr
parents:
15925
diff
changeset
|
121 |
} |
2acea266d297
Fix generation in corners by extending outline edge definitions
unC0Rr
parents:
15925
diff
changeset
|
122 |
} |