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