mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
Gemu's Revamped vox models added.
This commit is contained in:
parent
fdc61caf8f
commit
54c5a45004
assets/world
manifests/shrubs
shrub
jungle
savannah
structure/natural
common/src/comp/body
world/src
@ -25,4 +25,16 @@
|
||||
specifier: "world.shrub.jungle.bush-5",
|
||||
center: (5, 5, 5),
|
||||
),
|
||||
(
|
||||
specifier: "world.shrub.jungle.bush-6",
|
||||
center: (8, 7, 5),
|
||||
),
|
||||
(
|
||||
specifier: "world.shrub.jungle.bush-7",
|
||||
center: (7, 5, 5),
|
||||
),
|
||||
(
|
||||
specifier: "world.shrub.jungle.bush-8",
|
||||
center: (8, 8, 5),
|
||||
),
|
||||
]
|
||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
assets/world/shrub/jungle/bush-6.vox
Normal file
BIN
assets/world/shrub/jungle/bush-6.vox
Normal file
Binary file not shown.
BIN
assets/world/shrub/jungle/bush-7.vox
Normal file
BIN
assets/world/shrub/jungle/bush-7.vox
Normal file
Binary file not shown.
BIN
assets/world/shrub/jungle/bush-8.vox
Normal file
BIN
assets/world/shrub/jungle/bush-8.vox
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -52,7 +52,7 @@ impl Body {
|
||||
Body::DefaultAirship => Vec3::new(25.0, 50.0, 40.0),
|
||||
Body::AirBalloon => Vec3::new(25.0, 50.0, 40.0),
|
||||
Body::SailBoat => Vec3::new(13.0, 31.0, 3.0),
|
||||
Body::Galleon => Vec3::new(13.0, 31.0, 3.0), //replace with real vectors in a sec
|
||||
Body::Galleon => Vec3::new(13.0, 32.0, 3.0),
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -94,7 +94,7 @@ impl ForestKind {
|
||||
ForestKind::Birch => 0.65,
|
||||
ForestKind::Mangrove => 1.0,
|
||||
ForestKind::Swamp => 0.4,
|
||||
_ => 0.0,
|
||||
_ => 1.0,
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -58,16 +58,16 @@ pub fn apply_shrubs_to(canvas: &mut Canvas, _dynamic_rng: &mut impl Rng) {
|
||||
wpos: wpos.with_z(col.alt as i32),
|
||||
seed,
|
||||
kind,
|
||||
})
|
||||
})
|
||||
} else {
|
||||
None
|
||||
}
|
||||
} else {
|
||||
None
|
||||
}
|
||||
} else {
|
||||
None
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
for shrub in shrub_cache.values().filter_map(|s| s.as_ref()) {
|
||||
let mut rng = ChaChaRng::from_seed(seed_expan::rng_state(shrub.seed));
|
||||
|
Loading…
x
Reference in New Issue
Block a user