Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added wall module assets

Browse Source
This commit is contained in:
Joshua Barretto 2019-08-29 13:12:14 +01:00
parent 5a677b9c1e
commit 144703da1c
3 changed files with 41 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/world/module/wall/corner_ground.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/world/module/wall/edge_ground.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

92
world/src/generator/town/mod.rs
View File

@ -71,7 +71,7 @@ impl<'a> Sampler<'a> for TownGen {
(Vec2::new(1, 0), Vec2::unit_y(), -Vec2::unit_x()), (Vec2::new(1, 0), Vec2::unit_y(), -Vec2::unit_x()),
]; ];
MODULES[module.vol_idx] HOUSE_MODULES[module.vol_idx]
.0 .0
.get( .get(
Vec3::from( Vec3::from(
@ -510,7 +510,7 @@ impl TownVol {
.unwrap_or(ModuleKind::That); .unwrap_or(ModuleKind::That);
} }
let module = MODULES let module = HOUSE_MODULES
.iter() .iter()
.enumerate() .enumerate()
.filter_map(|(i, module)| { .filter_map(|(i, module)| {
@ -553,72 +553,50 @@ pub enum ModuleKind {
That, That,
} }
fn module(name: &str, sig: [ModuleKind; 6]) -> (Arc<Structure>, [ModuleKind; 6]) {
(
assets::load(&format!("world.module.{}", name)).unwrap(),
sig,
)
}
lazy_static! { lazy_static! {
pub static ref MODULES: Vec<(Arc<Structure>, [ModuleKind; 6])> = { pub static ref HOUSE_MODULES: Vec<(Arc<Structure>, [ModuleKind; 6])> = {
use ModuleKind::*; use ModuleKind::*;
vec![ vec![
( module("human.floor_ground", [This, This, This, This, This, That]),
assets::load("world.module.human.floor_ground").unwrap(), module("human.stair_ground", [This, This, This, This, This, That]),
[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]),
assets::load("world.module.human.stair_ground").unwrap(), module("human.window_ground", [This, This, This, That, This, That]),
[This, This, This, This, 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]),
assets::load("world.module.human.corner_ground").unwrap(), module("human.wall_roof", [This, This, This, That, That, This]),
[This, This, That, That, This, That], module("human.floor_upstairs", [This, This, This, This, This, This]),
), module(
( "human.balcony_upstairs",
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(),
[This, This, This, This, This, This], [This, This, This, This, This, This],
), ),
( module(
assets::load("world.module.human.balcony_upstairs").unwrap(), "human.corner_upstairs",
[This, This, This, This, This, This],
),
(
assets::load("world.module.human.corner_upstairs").unwrap(),
[This, This, That, That, This, This], [This, This, That, That, This, This],
), ),
( module("human.wall_upstairs", [This, This, This, That, This, This]),
assets::load("world.module.human.wall_upstairs").unwrap(), module(
[This, This, This, That, This, This], "human.window_upstairs",
),
(
assets::load("world.module.human.window_upstairs").unwrap(),
[This, This, This, That, This, This], [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]),
]
};
} }
/* /*