From 1b48699d1b1ad8d12fb1a404cec5bc8fc57d1805 Mon Sep 17 00:00:00 2001
From: Joshua Barretto <joshua.s.barretto@gmail.com>
Date: Thu, 29 Aug 2019 13:12:14 +0100
Subject: [PATCH] Added wall module assets

---
 assets/world/module/wall/corner_ground.vox | Bin 0 -> 2716 bytes
 assets/world/module/wall/edge_ground.vox   | Bin 0 -> 2608 bytes
 world/src/generator/town/mod.rs            |  92 ++++++++-------------
 3 files changed, 35 insertions(+), 57 deletions(-)
 create mode 100644 assets/world/module/wall/corner_ground.vox
 create mode 100644 assets/world/module/wall/edge_ground.vox

diff --git a/assets/world/module/wall/corner_ground.vox b/assets/world/module/wall/corner_ground.vox
new file mode 100644
index 0000000000000000000000000000000000000000..b59950d418baddb2a23c5afa51cf2539f49725fa
GIT binary patch
literal 2716
zcmds&zp7qE5Wsi-Pb5!ZAt_QRng|m34mP>uBDYXML2hn!``pGfK7uJy*eF=o`T~Lv
zpl^^DI{xNVX*3Wt1V8vOyEC)9Gqbbj`{v8bJ3p<pK7V-e1!6sWXRWU<uFh}Igx{@~
zxO{wdahZpD{U~cmtkd#!5?F?W)ks*_nt5aE87CBAEA)lF&=>kbU+5EkqEGaKJ_l@x
zEwBZ)z!vBOeatzG9h+lwY(8^rj?K^;dP8sM4ZY18q<~^q?228n>*%nn;<NBYIs_yX
z^hj)^f1(s8g#a5V_#+)@Ao#9XgRYo2Bq%J9A#=0rt*f^J7uf=Yu|gm7*d!8NY}NR6
zL4t#^4m*CzK4I(u1`0BGZmmesP4Fqk2>}iU3NqvIG0w{1Y<wXhz`+g~$k-HQ2z-lJ
zhE^bcM_)+d72*}*72=g6Ucn!m#TLYq<QYfq$~n4e8+|dk6ASwZ`xSZgph~|HFBtfY
z@#`2lIZl2`uTdjN2r%kX`1p)LK_JIB@dd>v@kz!34mNra2z+Y=z2nqv&Y%uRkz_6R
z2tMP{m2Qr29{E!Xo%`bc&^Krqy*lxb$C0~{yKO!7IC7tPZaI05UWGlGm$IkuE`(mB
zPSYR6+(8bI5a3{-kkrTV5yr(n?MO%n@ENm@;bV*yWOU<e_(G1H^NxB?&(Tv56PHZw
zW)Jc|;xyJ8?}i+~K%t5}z>YP}8Yeeu2>}TOeK7STHfYWiYEbOo^jkq582L@l;|B%`
zGIC;9VrHG-Q;ZV=91Ii$YI-h-mvb7~oLNUc_>ZLT3ca@Soe;hgNbW$ngJfRNkh3<&
zXYR<jBVbK3FA$xcpSJ-42|Di$90C%Qm<@blhXm#A7&rtZC~uIrW#AByp!A%9L%^!w
zI}MAwg0+YR)-t3a9qCAV8`er>@{Ph*@DqFlyI_;C6*PXu9A+%dx1BnWZ<BksLqI}7
z^Sz~J4gp4;90H8mI)t6R`t0l>|0&0hZ`%I4?EGGL?VDP6eSN*(+}ymiaXxtO-TmVI
zyZe(*KiQu?I=wQ^pPzrb|NiUu`yapku)p~8msk3~sXG5(&iU|zC;PpRp6(yt|L$L@
Z?b+Gcetv%bw|nsj_y3Z4qyMn~`U~!Sja>i$

literal 0
HcmV?d00001

diff --git a/assets/world/module/wall/edge_ground.vox b/assets/world/module/wall/edge_ground.vox
new file mode 100644
index 0000000000000000000000000000000000000000..c10a129d2334f628e616aa9035c0c8e02b0914d5
GIT binary patch
literal 2608
zcmdtiJE~?y5CGt=u6`-5Ktv3T6kj01{V|!#T;v8SD9AX`<THtr2yVc{z(_DKbpwJ6
z&>grA_i+6BL?${g=pbJB=swkTx~mTV?aw~G_sVyrln?LReq<;wJzvVFxA$*e*bn}m
z`;&X0-@pC6pW*UVloGvMl~%5Tl19ohQmie{%i7xW!Nl4WpW;(|icj$=KE#Lk5D)RO
zSsT{6wQj9j>*8I!?{mzXwPvkZYx~(+vzFp1p5iH<;<?{32Gx4CUaeQ_b;qpNDyPUb
zHadgJ+M_k?Ukxfg$yM$#<QtnY3AtszBQ`xR29-jbV_b5q%bM#lX%UxBm{->M+%IKz
zu`bpxNux8EguH5>p7tQA1cg=2qh3PJG#_*tNhS7NPLWg0SIA}1Y2-PoA=E<PhoJtZ
zj;5ZbuBP7IgPKShoxx;LoYkE*^x4neJ@50)r}#2&_DbgNVfWJ1NhN7}E^qZc?jGf^
z=5)@q_q6v^uXE+JJ*N^B){sk;Gvo~OP9t}mpzOI?;_R<EWA{FsIlMcZF?^$8Pv4nJ
z(&!8(ixO%7U5`G_-c#?XmVN&2eLs)O*nOIp=^QFaqcivKL(Qw}fkCH{RL1^}a>Bf@
znp_5*w&(UqIcZ)A3M=I@wte3Dy;C1UA9@YBRL0qRsx#G@>eM5h!DLawH>8p@I)lkN
z?eD2JmNUaQnD$?OYm;$uj+(pL8c8K6tg3eJg`8<V=roc_F!yh6@8g`}c{y{Q{m9?r
z{@smmCxv?=+$G_j3HMOAqrx2)?zeCkRXJ5ol~d(ZIaN-TQ{_}SDJSKmoRpJtQclWA
zIqA-D7L}yY8B7+XI*Uru=nN){Qk_L5X><mYMN1l8Y<2f$cYjmNnSAoW^&R*8`RATF
zp4Q>-Y2STT?>%_%;CS@t(SNqi_g;SSxP9%_<Kg@79*^%{J+aR3zxm?$`Nyx1Uw-=b
z`0dvpo|ylvzVrX(oHt&7c)a!I<KvyTzx+qO?e+EbadUI?mwWjqJpN7lfAnwmFMj|*
C`G!9L

literal 0
HcmV?d00001

diff --git a/world/src/generator/town/mod.rs b/world/src/generator/town/mod.rs
index 997bfde100..70b4b961aa 100644
--- a/world/src/generator/town/mod.rs
+++ b/world/src/generator/town/mod.rs
@@ -71,7 +71,7 @@ impl<'a> Sampler<'a> for TownGen {
                         (Vec2::new(1, 0), Vec2::unit_y(), -Vec2::unit_x()),
                     ];
 
-                    MODULES[module.vol_idx]
+                    HOUSE_MODULES[module.vol_idx]
                         .0
                         .get(
                             Vec3::from(
@@ -510,7 +510,7 @@ impl TownVol {
                             .unwrap_or(ModuleKind::That);
                     }
 
-                    let module = MODULES
+                    let module = HOUSE_MODULES
                         .iter()
                         .enumerate()
                         .filter_map(|(i, module)| {
@@ -553,72 +553,50 @@ pub enum ModuleKind {
     That,
 }
 
+fn module(name: &str, sig: [ModuleKind; 6]) -> (Arc<Structure>, [ModuleKind; 6]) {
+    (
+        assets::load(&format!("world.module.{}", name)).unwrap(),
+        sig,
+    )
+}
+
 lazy_static! {
-    pub static ref MODULES: Vec<(Arc<Structure>, [ModuleKind; 6])> = {
+    pub static ref HOUSE_MODULES: Vec<(Arc<Structure>, [ModuleKind; 6])> = {
         use ModuleKind::*;
         vec![
-            (
-                assets::load("world.module.human.floor_ground").unwrap(),
-                [This, This, This, This, This, That],
-            ),
-            (
-                assets::load("world.module.human.stair_ground").unwrap(),
-                [This, This, This, This, This, That],
-            ),
-            (
-                assets::load("world.module.human.corner_ground").unwrap(),
-                [This, This, That, That, This, That],
-            ),
-            (
-                assets::load("world.module.human.wall_ground").unwrap(),
-                [This, This, This, That, This, That],
-            ),
-            (
-                assets::load("world.module.human.door_ground").unwrap(),
-                [This, This, This, That, This, That],
-            ),
-            (
-                assets::load("world.module.human.window_ground").unwrap(),
-                [This, This, This, That, This, That],
-            ),
-            (
-                assets::load("world.module.human.floor_roof").unwrap(),
-                [This, This, This, This, That, This],
-            ),
-            (
-                assets::load("world.module.human.corner_roof").unwrap(),
-                [This, This, That, That, That, This],
-            ),
-            (
-                assets::load("world.module.human.chimney_roof").unwrap(),
-                [This, This, That, That, That, This],
-            ),
-            (
-                assets::load("world.module.human.wall_roof").unwrap(),
-                [This, This, This, That, That, This],
-            ),
-            (
-                assets::load("world.module.human.floor_upstairs").unwrap(),
+            module("human.floor_ground", [This, This, This, This, This, That]),
+            module("human.stair_ground", [This, This, This, This, This, That]),
+            module("human.corner_ground", [This, This, That, That, This, That]),
+            module("human.wall_ground", [This, This, This, That, This, That]),
+            module("human.door_ground", [This, This, This, That, This, That]),
+            module("human.window_ground", [This, This, This, That, This, That]),
+            module("human.floor_roof", [This, This, This, This, That, This]),
+            module("human.corner_roof", [This, This, That, That, That, This]),
+            module("human.chimney_roof", [This, This, That, That, That, This]),
+            module("human.wall_roof", [This, This, This, That, That, This]),
+            module("human.floor_upstairs", [This, This, This, This, This, This]),
+            module(
+                "human.balcony_upstairs",
                 [This, This, This, This, This, This],
             ),
-            (
-                assets::load("world.module.human.balcony_upstairs").unwrap(),
-                [This, This, This, This, This, This],
-            ),
-            (
-                assets::load("world.module.human.corner_upstairs").unwrap(),
+            module(
+                "human.corner_upstairs",
                 [This, This, That, That, This, This],
             ),
-            (
-                assets::load("world.module.human.wall_upstairs").unwrap(),
-                [This, This, This, That, This, This],
-            ),
-            (
-                assets::load("world.module.human.window_upstairs").unwrap(),
+            module("human.wall_upstairs", [This, This, This, That, This, This]),
+            module(
+                "human.window_upstairs",
                 [This, This, This, That, This, This],
             ),
         ]
     };
+    pub static ref WALL_MODULES: Vec<(Arc<Structure>, [ModuleKind; 6])> = {
+        use ModuleKind::*;
+        vec![
+            module("wall.edge_ground", [This, That, This, That, This, That]),
+            module("wall.corner_ground", [This, This, That, That, This, That]),
+        ]
+    };
 }
 
 /*